Subject: x86: Use kbuild.h

Drop the macro definitions in asm-offsets_*.c and use kbuild.h

Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Christoph Lameter <clameter@sgi.com>

---
 arch/x86/kernel/asm-offsets_32.c |    9 +--------
 arch/x86/kernel/asm-offsets_64.c |    9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

Index: linux-2.6.25-rc8-mm2/arch/x86/kernel/asm-offsets_32.c
===================================================================
--- linux-2.6.25-rc8-mm2.orig/arch/x86/kernel/asm-offsets_32.c	2008-04-12 18:06:30.919676045 -0700
+++ linux-2.6.25-rc8-mm2/arch/x86/kernel/asm-offsets_32.c	2008-04-12 18:07:42.027173867 -0700
@@ -9,6 +9,7 @@
 #include <linux/signal.h>
 #include <linux/personality.h>
 #include <linux/suspend.h>
+#include <linux/kbuild.h>
 #include <asm/ucontext.h>
 #include "sigframe.h"
 #include <asm/pgtable.h>
@@ -23,14 +24,6 @@
 #include <linux/lguest.h>
 #include "../../../drivers/lguest/lg.h"
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
-#define OFFSET(sym, str, mem) \
-	DEFINE(sym, offsetof(struct str, mem));
-
 /* workaround for a warning with -Wmissing-prototypes */
 void foo(void);
 
Index: linux-2.6.25-rc8-mm2/arch/x86/kernel/asm-offsets_64.c
===================================================================
--- linux-2.6.25-rc8-mm2.orig/arch/x86/kernel/asm-offsets_64.c	2008-04-12 18:06:30.959677447 -0700
+++ linux-2.6.25-rc8-mm2/arch/x86/kernel/asm-offsets_64.c	2008-04-12 18:07:42.027173867 -0700
@@ -10,6 +10,7 @@
 #include <linux/errno.h> 
 #include <linux/hardirq.h>
 #include <linux/suspend.h>
+#include <linux/kbuild.h>
 #include <asm/pda.h>
 #include <asm/processor.h>
 #include <asm/segment.h>
@@ -17,14 +18,6 @@
 #include <asm/ia32.h>
 #include <asm/bootparam.h>
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
-#define OFFSET(sym, str, mem) \
-	DEFINE(sym, offsetof(struct str, mem))
-
 #define __NO_STUBS 1
 #undef __SYSCALL
 #undef _ASM_X86_64_UNISTD_H_