diff options
author | Tim Abbott <tabbott@ksplice.com> | 2009-10-18 13:23:51 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@goober.(none)> | 2009-12-03 20:45:31 -0500 |
commit | 49612a5fa574227db9eb14b0dd4befcf4e273a73 (patch) | |
tree | 3ff93423519c296bc3433b5c01978bed540cb25a | |
parent | d6cd1f0c38c9820472fb898cb6fa1b3fc42a85a8 (diff) |
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.S | 7 |
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 @@ | |||
9 | 9 | ||
10 | #include <asm-generic/vmlinux.lds.h> | 10 | #include <asm-generic/vmlinux.lds.h> |
11 | #include <asm/page.h> | 11 | #include <asm/page.h> |
12 | #include <asm/thread_info.h> | ||
12 | 13 | ||
13 | #if defined(CONFIG_RAMKERNEL) | 14 | #if defined(CONFIG_RAMKERNEL) |
14 | #define RAM_START CONFIG_KERNELBASE | 15 | #define RAM_START CONFIG_KERNELBASE |
@@ -148,10 +149,8 @@ SECTIONS { | |||
148 | . = ALIGN(4); | 149 | . = ALIGN(4); |
149 | _sdata = . ; | 150 | _sdata = . ; |
150 | DATA_DATA | 151 | DATA_DATA |
151 | . = ALIGN(32); | 152 | CACHELINE_ALIGNED_DATA(32) |
152 | *(.data.cacheline_aligned) | 153 | INIT_TASK_DATA(THREAD_SIZE) |
153 | . = ALIGN(8192) ; | ||
154 | *(.data.init_task) | ||
155 | _edata = . ; | 154 | _edata = . ; |
156 | } > DATA | 155 | } > DATA |
157 | 156 | ||