m68knommu: Use INIT_TASK_DATA and CACHELINE_ALIGNED_DATA.

Signed-off-by: Tim Abbott <tabbott@ksplice.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>

diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index a0108fd6d341839293f745f8d642ef19a878a319..d6c814e4055b4340886d3f1becccd002f7f44324 100644 (file)
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -9,6 +9,7 @@
 
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/page.h>
+#include <asm/thread_info.h>
 
 #if defined(CONFIG_RAMKERNEL)
 #define        RAM_START       CONFIG_KERNELBASE
@@ -148,10 +149,8 @@ SECTIONS {
                . = ALIGN(4);
                _sdata = . ;
                DATA_DATA
-               . = ALIGN(32);
-               *(.data.cacheline_aligned)
-               . = ALIGN(8192) ;
-               *(.data.init_task)
+               CACHELINE_ALIGNED_DATA(32)
+               INIT_TASK_DATA(THREAD_SIZE)
                _edata = . ;
        } > DATA