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

Cc: paulus@samba.org
Signed-off-by: Christoph Lameter <clameter@sgi.com>

---
 arch/powerpc/kernel/asm-offsets.c |    6 +-----
 arch/ppc/kernel/asm-offsets.c     |    7 ++-----
 2 files changed, 3 insertions(+), 10 deletions(-)

Index: linux-2.6.25-rc8-mm2/arch/powerpc/kernel/asm-offsets.c
===================================================================
--- linux-2.6.25-rc8-mm2.orig/arch/powerpc/kernel/asm-offsets.c	2008-04-12 19:36:15.348425203 -0700
+++ linux-2.6.25-rc8-mm2/arch/powerpc/kernel/asm-offsets.c	2008-04-12 19:36:26.299675373 -0700
@@ -27,6 +27,7 @@
 #include <linux/time.h>
 #include <linux/hardirq.h>
 #endif
+#include <linux/kbuild.h>
 
 #include <asm/io.h>
 #include <asm/page.h>
@@ -45,11 +46,6 @@
 #include <asm/hvcall.h>
 #endif
 
-#define DEFINE(sym, val) \
-	asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
 int main(void)
 {
 	DEFINE(THREAD, offsetof(struct task_struct, thread));
Index: linux-2.6.25-rc8-mm2/arch/ppc/kernel/asm-offsets.c
===================================================================
--- linux-2.6.25-rc8-mm2.orig/arch/ppc/kernel/asm-offsets.c	2008-04-12 19:36:15.358425027 -0700
+++ linux-2.6.25-rc8-mm2/arch/ppc/kernel/asm-offsets.c	2008-04-12 19:36:26.339675619 -0700
@@ -18,6 +18,8 @@
 #include <linux/suspend.h>
 #include <linux/mman.h>
 #include <linux/mm.h>
+#include <linux/kbuild.h>
+
 #include <asm/io.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
@@ -26,11 +28,6 @@
 #include <asm/thread_info.h>
 #include <asm/vdso_datapage.h>
 
-#define DEFINE(sym, val) \
-	asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
 int
 main(void)
 {