From: Christoph Lameter <clameter@sgi.com>

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

diff -puN arch/m68k/kernel/asm-offsets.c~m68k-m68kmmu-use-kbuildh-instead-of-defining-macros-in-asm-offsetsc arch/m68k/kernel/asm-offsets.c
--- a/arch/m68k/kernel/asm-offsets.c~m68k-m68kmmu-use-kbuildh-instead-of-defining-macros-in-asm-offsetsc
+++ a/arch/m68k/kernel/asm-offsets.c
@@ -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 */
diff -puN arch/m68knommu/kernel/asm-offsets.c~m68k-m68kmmu-use-kbuildh-instead-of-defining-macros-in-asm-offsetsc arch/m68knommu/kernel/asm-offsets.c
--- a/arch/m68knommu/kernel/asm-offsets.c~m68k-m68kmmu-use-kbuildh-instead-of-defining-macros-in-asm-offsetsc
+++ a/arch/m68knommu/kernel/asm-offsets.c
@@ -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 */
_