aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2008-04-29 04:04:09 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 11:06:30 -0400
commit7a88d7a8f467e4ab1d3393ed5bce3d68cdf9be2e (patch)
treec09e0791d66fce1dc6f042bbe692f27b251f9051 /arch
parentd4d298feeaebb43e0a74e5e2333f1b566c34a37c (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/kernel/asm-offsets.c5
1 files changed, 2 insertions, 3 deletions
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 @@
5 */ 5 */
6 6
7#include <linux/sched.h> 7#include <linux/sched.h>
8#include <linux/kbuild.h>
8 9
9/* Use marker if you need to separate the values later */ 10/* Use marker if you need to separate the values later */
10 11#undef DEFINE
11#define DEFINE(sym, val, marker) \ 12#define DEFINE(sym, val, marker) \
12 asm volatile("\n->" #sym " %0 " #val " " #marker : : "i" (val)) 13 asm volatile("\n->" #sym " %0 " #val " " #marker : : "i" (val))
13 14
14#define BLANK() asm volatile("\n->" : : )
15
16int main(void) 15int main(void)
17{ 16{
18 DEFINE(__THREAD_info, offsetof(struct task_struct, stack),); 17 DEFINE(__THREAD_info, offsetof(struct task_struct, stack),);