projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://oss.sgi.com:8090/xfs/xfs-2.6
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/arm/kernel/vmlinux.lds.S
b/arch/arm/kernel/vmlinux.lds.S
index 3ca574ee277271e04b05c79ed956337b3e7dfb7a..b929a60f7547cdde716dca1c18b06aafd92f8a22 100644
(file)
--- a/
arch/arm/kernel/vmlinux.lds.S
+++ b/
arch/arm/kernel/vmlinux.lds.S
@@
-45,13
+45,7
@@
SECTIONS
*(.early_param.init)
__early_end = .;
__initcall_start = .;
*(.early_param.init)
__early_end = .;
__initcall_start = .;
- *(.initcall1.init)
- *(.initcall2.init)
- *(.initcall3.init)
- *(.initcall4.init)
- *(.initcall5.init)
- *(.initcall6.init)
- *(.initcall7.init)
+ INITCALLS
__initcall_end = .;
__con_initcall_start = .;
*(.con_initcall.init)
__initcall_end = .;
__con_initcall_start = .;
*(.con_initcall.init)
@@
-59,10
+53,12
@@
SECTIONS
__security_initcall_start = .;
*(.security_initcall.init)
__security_initcall_end = .;
__security_initcall_start = .;
*(.security_initcall.init)
__security_initcall_end = .;
+#ifdef CONFIG_BLK_DEV_INITRD
. = ALIGN(32);
__initramfs_start = .;
usr/built-in.o(.init.ramfs)
__initramfs_end = .;
. = ALIGN(32);
__initramfs_start = .;
usr/built-in.o(.init.ramfs)
__initramfs_end = .;
+#endif
. = ALIGN(64);
__per_cpu_start = .;
*(.data.percpu)
. = ALIGN(64);
__per_cpu_start = .;
*(.data.percpu)