From: Christoph Lameter <clameter@sgi.com>
Date: Tue, 29 Apr 2008 08:04:09 +0000 (-0700)
Subject: s390: use kbuild.h instead of defining macros in asm-offsets.c
X-Git-Tag: v2.6.26-rc1~377
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7a88d7a8f467e4ab1d3393ed5bce3d68cdf9be2e;p=linux-2.6-omap-h63xx.git

s390: use kbuild.h instead of defining macros in asm-offsets.c

s390 has a strange marker in DEFINE.  Undefine the DEFINE from kbuild.h and
define it the way s390 wants it to preserve things as they were.

May be good if the arch maintainer could go over this and check if this
workaround is really necessary.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c
index 1375f8a4469..f7807b81c47 100644
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@ -5,14 +5,13 @@
  */
 
 #include <linux/sched.h>
+#include <linux/kbuild.h>
 
 /* Use marker if you need to separate the values later */
-
+#undef DEFINE
 #define DEFINE(sym, val, marker) \
 	asm volatile("\n->" #sym " %0 " #val " " #marker : : "i" (val))
 
-#define BLANK() asm volatile("\n->" : : )
-
 int main(void)
 {
 	DEFINE(__THREAD_info, offsetof(struct task_struct, stack),);