git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/sparc/kernel/vmlinux.lds.S
b/arch/sparc/kernel/vmlinux.lds.S
index
e5c24e0
..
4758388
100644
(file)
--- a/
arch/sparc/kernel/vmlinux.lds.S
+++ b/
arch/sparc/kernel/vmlinux.lds.S
@@
-12,7
+12,7
@@
SECTIONS
.text 0xf0004000 :
{
_text = .;
.text 0xf0004000 :
{
_text = .;
- *(.text)
+ TEXT_TEXT
SCHED_TEXT
LOCK_TEXT
*(.gnu.warning)
SCHED_TEXT
LOCK_TEXT
*(.gnu.warning)
@@
-22,7
+22,7
@@
SECTIONS
RODATA
.data :
{
RODATA
.data :
{
- *(.data)
+ DATA_DATA
CONSTRUCTORS
}
.data1 : { *(.data1) }
CONSTRUCTORS
}
.data1 : { *(.data1) }
@@
-65,10
+65,7
@@
SECTIONS
__initramfs_end = .;
#endif
__initramfs_end = .;
#endif
- . = ALIGN(32);
- __per_cpu_start = .;
- .data.percpu : { *(.data.percpu) }
- __per_cpu_end = .;
+ PERCPU(4096)
. = ALIGN(4096);
__init_end = .;
. = ALIGN(32);
. = ALIGN(4096);
__init_end = .;
. = ALIGN(32);