Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

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

diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 24ff7d9831148564011e4b54c9ff9c7f91e6b764..0c458556399fc9bc194ca37e834fcb2d72011b70 100644 (file)
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -7,6 +7,7 @@
 #define PROVIDE32(x)   PROVIDE(x)
 #endif
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/cache.h>
 
 ENTRY(_stext)
 
@@ -62,6 +63,8 @@ SECTIONS
                __stop___ex_table = .;
        }
 
+       NOTES
+
        BUG_TABLE
 
 /*
@@ -143,6 +146,7 @@ SECTIONS
        .data.percpu : {
                __per_cpu_start = .;
                *(.data.percpu)
+               *(.data.percpu.shared_aligned)
                __per_cpu_end = .;
        }
 
@@ -213,6 +217,11 @@ SECTIONS
                *(.data.cacheline_aligned)
        }
 
+       . = ALIGN(L1_CACHE_BYTES);
+       .data.read_mostly : {
+               *(.data.read_mostly)
+       }
+
        . = ALIGN(PAGE_SIZE);
        __data_nosave : {
                __nosave_begin = .;