diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-01-06 03:19:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:53 -0500 |
| commit | 347a8dc3b815f0c0fa62a1df075184ffe4cbdcf1 (patch) | |
| tree | a6ec76690127e87fe6efa42b6238caadd6c07e7b /arch/s390/mm/extmem.c | |
| parent | 9bbc8346fb21fad3f678220b067450e436e45dbf (diff) | |
[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/mm/extmem.c')
| -rw-r--r-- | arch/s390/mm/extmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c index 506a33b51e4f..a9566bcab682 100644 --- a/arch/s390/mm/extmem.c +++ b/arch/s390/mm/extmem.c | |||
| @@ -143,7 +143,7 @@ dcss_diag (__u8 func, void *parameter, | |||
| 143 | rx = (unsigned long) parameter; | 143 | rx = (unsigned long) parameter; |
| 144 | ry = (unsigned long) func; | 144 | ry = (unsigned long) func; |
| 145 | __asm__ __volatile__( | 145 | __asm__ __volatile__( |
| 146 | #ifdef CONFIG_ARCH_S390X | 146 | #ifdef CONFIG_64BIT |
| 147 | " sam31\n" // switch to 31 bit | 147 | " sam31\n" // switch to 31 bit |
| 148 | " diag %0,%1,0x64\n" | 148 | " diag %0,%1,0x64\n" |
| 149 | " sam64\n" // switch back to 64 bit | 149 | " sam64\n" // switch back to 64 bit |