Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/hskinnem...

[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 7a1f5a0964de580c14448dc7c6888814791ec1c2..823a8cbd60b5bffd1025cff71ee2b56e0c751f76 100644 (file)
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -34,6 +34,8 @@ SECTIONS
 
        /* Text and gots */
        .text : {
+               ALIGN_FUNCTION();
+               *(.text.head)
                _text = .;
                TEXT_TEXT
                SCHED_TEXT
@@ -177,7 +179,9 @@ SECTIONS
        }
 #else
        .data : {
-               *(.data .data.rel* .toc1)
+               DATA_DATA
+               *(.data.rel*)
+               *(.toc1)
                *(.branch_lt)
        }