Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / arch / powerpc / kernel / vmlinux.lds.S

diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 2412c056baa45bcf81d5716786ccc6edfd9118a3..161b9b9691f0b3591c25d546202205ec79ab4a4a 100644 (file)
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -87,7 +87,9 @@ SECTIONS
        /* The dummy segment contents for the bug workaround mentioned above
           near PHDRS.  */
        .dummy : AT(ADDR(.dummy) - LOAD_OFFSET) {
-               LONG(0xf177)
+               LONG(0)
+               LONG(0)
+               LONG(0)
        } :kernel :dummy
 
 /*
@@ -152,6 +154,12 @@ SECTIONS
                __stop___ftr_fixup = .;
        }
        . = ALIGN(8);
+       __mmu_ftr_fixup : AT(ADDR(__mmu_ftr_fixup) - LOAD_OFFSET) {
+               __start___mmu_ftr_fixup = .;
+               *(__mmu_ftr_fixup)
+               __stop___mmu_ftr_fixup = .;
+       }
+       . = ALIGN(8);
        __lwsync_fixup : AT(ADDR(__lwsync_fixup) - LOAD_OFFSET) {
                __start___lwsync_fixup = .;
                *(__lwsync_fixup)