Subject: m68k/m68kmmu: Use kbuild.h instead of defining macros in asm-offsets.c


Signed-off-by: Christoph Lameter <clameter@sgi.com>

---
 arch/m68k/kernel/asm-offsets.c      |    4 +---
 arch/m68knommu/kernel/asm-offsets.c |    6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

Index: linux-2.6.25-rc8-mm2/arch/m68k/kernel/asm-offsets.c
===================================================================
--- linux-2.6.25-rc8-mm2.orig/arch/m68k/kernel/asm-offsets.c	2008-04-12 19:31:10.477177436 -0700
+++ linux-2.6.25-rc8-mm2/arch/m68k/kernel/asm-offsets.c	2008-04-12 19:32:05.358427431 -0700
@@ -11,14 +11,12 @@
 #include <linux/stddef.h>
 #include <linux/sched.h>
 #include <linux/kernel_stat.h>
+#include <linux/kbuild.h>
 #include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/amigahw.h>
 #include <linux/font.h>
 
-#define DEFINE(sym, val) \
-	asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
 int main(void)
 {
 	/* offsets into the task struct */
Index: linux-2.6.25-rc8-mm2/arch/m68knommu/kernel/asm-offsets.c
===================================================================
--- linux-2.6.25-rc8-mm2.orig/arch/m68knommu/kernel/asm-offsets.c	2008-04-12 19:31:10.727178350 -0700
+++ linux-2.6.25-rc8-mm2/arch/m68knommu/kernel/asm-offsets.c	2008-04-12 19:32:05.358427431 -0700
@@ -13,15 +13,11 @@
 #include <linux/kernel_stat.h>
 #include <linux/ptrace.h>
 #include <linux/hardirq.h>
+#include <linux/kbuild.h>
 #include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/thread_info.h>
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
 int main(void)
 {
 	/* offsets into the task struct */