Merge branch 'x86/apic' into irq/numa

[safe/jmp/linux-2.6] / arch / m68k / kernel / vmlinux-sun3.lds

diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
index cdc313e..c192f77 100644 (file)
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@@ -1,6 +1,7 @@
 /* ld script to make m68k Linux kernel */
 
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/page.h>
 
 OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k")
 OUTPUT_ARCH(m68k)
@@ -11,7 +12,7 @@ SECTIONS
   . = 0xE002000;
   _text = .;                   /* Text and read-only data */
   .text : {
-       *(.text.head)
+       HEAD_TEXT
        TEXT_TEXT
        SCHED_TEXT
        LOCK_TEXT
@@ -32,9 +33,10 @@ SECTIONS
        } :data
   /* End of data goes *here* so that freeing init code works properly. */
   _edata = .;
+  NOTES
 
   /* will be freed after init */
-  . = ALIGN(8192);     /* Init code and data */
+  . = ALIGN(PAGE_SIZE);        /* Init code and data */
 __init_begin = .;
        .init.text : {
                _sinittext = .;
@@ -61,12 +63,12 @@ __init_begin = .;
        }
        SECURITY_INIT
 #ifdef CONFIG_BLK_DEV_INITRD
-       . = ALIGN(8192);
+       . = ALIGN(PAGE_SIZE);
        __initramfs_start = .;
        .init.ramfs : { *(.init.ramfs) }
        __initramfs_end = .;
 #endif
-       . = ALIGN(8192);
+       . = ALIGN(PAGE_SIZE);
        __init_end = .;
        .data.init.task : { *(.data.init_task) }