diff options
| author | Martin Schwidefsky | 2006-01-06 09:19:28 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-01-06 17:33:53 +0100 |
| commit | 347a8dc3b815f0c0fa62a1df075184ffe4cbdcf1 (patch) | |
| tree | a6ec76690127e87fe6efa42b6238caadd6c07e7b /arch/s390/lib/spinlock.c | |
| parent | [PATCH] s390: fix invalid return code in sclp_cpi (diff) | |
| download | kernel-qcow2-linux-347a8dc3b815f0c0fa62a1df075184ffe4cbdcf1.tar.gz kernel-qcow2-linux-347a8dc3b815f0c0fa62a1df075184ffe4cbdcf1.tar.xz kernel-qcow2-linux-347a8dc3b815f0c0fa62a1df075184ffe4cbdcf1.zip | |
[PATCH] s390: cleanup Kconfig
Sanitize some s390 Kconfig options. We have ARCH_S390, ARCH_S390X,
ARCH_S390_31, 64BIT, S390_SUPPORT and COMPAT. Replace these 6 options by
S390, 64BIT and COMPAT.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/s390/lib/spinlock.c')
| -rw-r--r-- | arch/s390/lib/spinlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c index 2dc14e9c8327..68d79c502081 100644 --- a/arch/s390/lib/spinlock.c +++ b/arch/s390/lib/spinlock.c @@ -29,7 +29,7 @@ __setup("spin_retry=", spin_retry_setup); static inline void _diag44(void) { -#ifdef __s390x__ +#ifdef CONFIG_64BIT if (MACHINE_HAS_DIAG44) #endif asm volatile("diag 0,0,0x44"); |