From c0cb2152f77e770bd39acf324ee22dc0f348abc5 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@ksplice.com>
Date: Sun, 18 Oct 2009 13:23:51 -0400
Subject: [PATCH] --- yaml --- r: 173533 b: refs/heads/master c:
 49612a5fa574227db9eb14b0dd4befcf4e273a73 h: refs/heads/master i:   173531:
 46e9d1de117c17c500b6531f3a7c53ffdbef08a8 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/m68knommu/kernel/vmlinux.lds.S | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 29000e487392..4165c6fb9653 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6cd1f0c38c9820472fb898cb6fa1b3fc42a85a8
+refs/heads/master: 49612a5fa574227db9eb14b0dd4befcf4e273a73
diff --git a/trunk/arch/m68knommu/kernel/vmlinux.lds.S b/trunk/arch/m68knommu/kernel/vmlinux.lds.S
index a0108fd6d341..d6c814e4055b 100644
--- a/trunk/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/trunk/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