Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[karo-tx-linux.git] / arch / powerpc / kernel / vmlinux.lds.S

diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index dcd01c82e7013c8e08f797eaa40c9543d5f2fc01..8a0deefac08d216c2ebd127add50ce8117f74f79 100644 (file)
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -223,19 +223,17 @@ SECTIONS
 #endif
 
        /* The initial task and kernel stack */
-       .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {
-               INIT_TASK_DATA(THREAD_SIZE)
-       }
+       INIT_TASK_DATA_SECTION(THREAD_SIZE)
 
-       .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) {
+       .data..page_aligned : AT(ADDR(.data..page_aligned) - LOAD_OFFSET) {
                PAGE_ALIGNED_DATA(PAGE_SIZE)
        }
 
-       .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
+       .data..cacheline_aligned : AT(ADDR(.data..cacheline_aligned) - LOAD_OFFSET) {
                CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
        }
 
-       .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) {
+       .data..read_mostly : AT(ADDR(.data..read_mostly) - LOAD_OFFSET) {
                READ_MOSTLY_DATA(L1_CACHE_BYTES)
        }