Title: [9272] trunk: vmlinux.lds.h: use change going upstream -- set cpio alignment for everyone to 4 bytes
- Revision
- 9272
- Author
- vapier
- Date
- 2010-10-21 20:29:52 -0400 (Thu, 21 Oct 2010)
Log Message
vmlinux.lds.h: use change going upstream -- set cpio alignment for everyone to 4 bytes
Modified Paths
Diff
Modified: trunk/arch/blackfin/kernel/vmlinux.lds.S (9271 => 9272)
--- trunk/arch/blackfin/kernel/vmlinux.lds.S 2010-10-22 00:24:54 UTC (rev 9271)
+++ trunk/arch/blackfin/kernel/vmlinux.lds.S 2010-10-22 00:29:52 UTC (rev 9272)
@@ -153,7 +153,7 @@
INIT_CALLS
CON_INITCALL
SECURITY_INITCALL
- INIT_RAMFS(4)
+ INIT_RAM_FS
. = ALIGN(4);
___per_cpu_load = .;
Modified: trunk/include/asm-generic/vmlinux.lds.h (9271 => 9272)
--- trunk/include/asm-generic/vmlinux.lds.h 2010-10-22 00:24:54 UTC (rev 9271)
+++ trunk/include/asm-generic/vmlinux.lds.h 2010-10-22 00:29:52 UTC (rev 9272)
@@ -626,15 +626,14 @@
VMLINUX_SYMBOL(__security_initcall_end) = .;
#ifdef CONFIG_BLK_DEV_INITRD
-#define INIT_RAMFS(align) \
- . = ALIGN(align); \
+#define INIT_RAM_FS \
+ . = ALIGN(4); \
VMLINUX_SYMBOL(__initramfs_start) = .; \
*(.init.ramfs) \
VMLINUX_SYMBOL(__initramfs_end) = .;
#else
-#define INIT_RAMFS(align)
+#define INIT_RAM_FS
#endif
-#define INIT_RAM_FS INIT_RAMFS(PAGE_SIZE)
/*
* Default discarded sections.
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
