summary refs log tree commit diff
diff options
context:
space:
mode:
authorTim Abbott <tabbott@ksplice.com>2009-10-18 13:23:51 -0400
committerGreg Ungerer <gerg@goober.(none)>2009-12-04 11:45:31 +1000
commit49612a5fa574227db9eb14b0dd4befcf4e273a73 (patch)
tree3ff93423519c296bc3433b5c01978bed540cb25a
parentd6cd1f0c38c9820472fb898cb6fa1b3fc42a85a8 (diff)
downloadlinux-49612a5fa574227db9eb14b0dd4befcf4e273a73.tar.gz
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>
-rw-r--r--arch/m68knommu/kernel/vmlinux.lds.S7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index a0108fd6d341..d6c814e4055b 100644
--- 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