[PATCH] s390: cleanup Kconfig · tjh.dev/kernel@347a8dc

+7 -20

arch/s390/Kconfig

··· 23 23 24 24 mainmenu "Linux Kernel Configuration" 25 25 26 - config ARCH_S390 26 + config S390 27 27 bool 28 28 default y 29 29 30 30 config UID16 31 31 bool 32 32 default y 33 - depends on ARCH_S390X = 'n' 33 + depends on !64BIT 34 34 35 35 source "init/Kconfig" 36 36 ··· 38 38 39 39 comment "Processor type and features" 40 40 41 - config ARCH_S390X 41 + config 64BIT 42 42 bool "64 bit kernel" 43 43 help 44 44 Select this option if you have a 64 bit IBM zSeries machine 45 45 and want to use the 64 bit addressing mode. 46 - 47 - config 64BIT 48 - def_bool ARCH_S390X 49 - 50 - config ARCH_S390_31 51 - bool 52 - depends on ARCH_S390X = 'n' 53 - default y 54 46 55 47 config SMP 56 48 bool "Symmetric multi-processing support" ··· 93 101 on older S/390 machines. Say Y unless you know your machine doesn't 94 102 need this. 95 103 96 - config S390_SUPPORT 104 + config COMPAT 97 105 bool "Kernel support for 31 bit emulation" 98 - depends on ARCH_S390X 106 + depends on 64BIT 99 107 help 100 108 Select this option if you want to enable your system kernel to 101 109 handle system-calls from ELF binaries for 31 bit ESA. This option 102 110 (and some other stuff like libraries and such) is needed for 103 111 executing 31 bit applications. It is safe to say "Y". 104 - 105 - config COMPAT 106 - bool 107 - depends on S390_SUPPORT 108 - default y 109 112 110 113 config SYSVIPC_COMPAT 111 114 bool ··· 109 122 110 123 config BINFMT_ELF32 111 124 tristate "Kernel support for 31 bit ELF binaries" 112 - depends on S390_SUPPORT 125 + depends on COMPAT 113 126 help 114 127 This allows you to run 32-bit Linux/ELF binaries on your zSeries 115 128 in 64 bit mode. Everybody wants this; say Y. ··· 122 135 123 136 config MARCH_G5 124 137 bool "S/390 model G5 and G6" 125 - depends on ARCH_S390_31 138 + depends on !64BIT 126 139 help 127 140 Select this to build a 31 bit kernel that works 128 141 on all S/390 and zSeries machines.

+2 -4

arch/s390/Makefile

··· 13 13 # Copyright (C) 1994 by Linus Torvalds 14 14 # 15 15 16 - ifdef CONFIG_ARCH_S390_31 16 + ifndef CONFIG_64BIT 17 17 LDFLAGS := -m elf_s390 18 18 CFLAGS += -m31 19 19 AFLAGS += -m31 20 20 UTS_MACHINE := s390 21 21 STACK_SIZE := 8192 22 22 CHECKFLAGS += -D__s390__ 23 - endif 24 - 25 - ifdef CONFIG_ARCH_S390X 23 + else 26 24 LDFLAGS := -m elf64_s390 27 25 MODFLAGS += -fpic -D__PIC__ 28 26 CFLAGS += -m64

+4 -4

arch/s390/appldata/appldata_base.c

··· 40 40 41 41 #define TOD_MICRO 0x01000 /* nr. of TOD clock units 42 42 for 1 microsecond */ 43 - #ifndef CONFIG_ARCH_S390X 43 + #ifndef CONFIG_64BIT 44 44 45 45 #define APPLDATA_START_INTERVAL_REC 0x00 /* Function codes for */ 46 46 #define APPLDATA_STOP_REC 0x01 /* DIAG 0xDC */ ··· 54 54 #define APPLDATA_GEN_EVENT_RECORD 0x82 55 55 #define APPLDATA_START_CONFIG_REC 0x83 56 56 57 - #endif /* CONFIG_ARCH_S390X */ 57 + #endif /* CONFIG_64BIT */ 58 58 59 59 60 60 /* 61 61 * Parameter list for DIAGNOSE X'DC' 62 62 */ 63 - #ifndef CONFIG_ARCH_S390X 63 + #ifndef CONFIG_64BIT 64 64 struct appldata_parameter_list { 65 65 u16 diag; /* The DIAGNOSE code X'00DC' */ 66 66 u8 function; /* The function code for the DIAGNOSE */ ··· 82 82 u64 product_id_addr; 83 83 u64 buffer_addr; 84 84 }; 85 - #endif /* CONFIG_ARCH_S390X */ 85 + #endif /* CONFIG_64BIT */ 86 86 87 87 /* 88 88 * /proc entries (sysctl)

+5 -5

arch/s390/crypto/crypt_s390.h

··· 112 112 * [ret] is the variable to receive the error code 113 113 * [ERR] is the error code value 114 114 */ 115 - #ifndef __s390x__ 115 + #ifndef CONFIG_64BIT 116 116 #define __crypt_s390_fixup \ 117 117 ".section .fixup,\"ax\" \n" \ 118 118 "7: lhi %0,%h[e1] \n" \ ··· 129 129 " .long 0b,7b \n" \ 130 130 " .long 1b,8b \n" \ 131 131 ".previous" 132 - #else /* __s390x__ */ 132 + #else /* CONFIG_64BIT */ 133 133 #define __crypt_s390_fixup \ 134 134 ".section .fixup,\"ax\" \n" \ 135 135 "7: lhi %0,%h[e1] \n" \ ··· 142 142 " .quad 0b,7b \n" \ 143 143 " .quad 1b,8b \n" \ 144 144 ".previous" 145 - #endif /* __s390x__ */ 145 + #endif /* CONFIG_64BIT */ 146 146 147 147 /* 148 148 * Standard code for setting the result of s390 crypto instructions. ··· 150 150 * [result]: the register containing the result (e.g. second operand length 151 151 * to compute number of processed bytes]. 152 152 */ 153 - #ifndef __s390x__ 153 + #ifndef CONFIG_64BIT 154 154 #define __crypt_s390_set_result \ 155 155 " lr %0,%[result] \n" 156 - #else /* __s390x__ */ 156 + #else /* CONFIG_64BIT */ 157 157 #define __crypt_s390_set_result \ 158 158 " lgr %0,%[result] \n" 159 159 #endif

+1 -3

arch/s390/defconfig

··· 6 6 CONFIG_MMU=y 7 7 CONFIG_RWSEM_XCHGADD_ALGORITHM=y 8 8 CONFIG_GENERIC_CALIBRATE_DELAY=y 9 - CONFIG_ARCH_S390=y 9 + CONFIG_S390=y 10 10 CONFIG_UID16=y 11 11 12 12 # ··· 89 89 # 90 90 # Processor type and features 91 91 # 92 - # CONFIG_ARCH_S390X is not set 93 92 # CONFIG_64BIT is not set 94 - CONFIG_ARCH_S390_31=y 95 93 CONFIG_SMP=y 96 94 CONFIG_NR_CPUS=32 97 95 CONFIG_HOTPLUG_CPU=y

+5 -10

arch/s390/kernel/Makefile

··· 8 8 setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \ 9 9 semaphore.o s390_ext.o debug.o profile.o irq.o reipl_diag.o 10 10 11 + obj-y += $(if $(CONFIG_64BIT),entry64.o,entry.o) 12 + obj-y += $(if $(CONFIG_64BIT),reipl64.o,reipl.o) 13 + 11 14 extra-y += head.o init_task.o vmlinux.lds 12 15 13 16 obj-$(CONFIG_MODULES) += s390_ksyms.o module.o 14 17 obj-$(CONFIG_SMP) += smp.o 15 18 16 - obj-$(CONFIG_S390_SUPPORT) += compat_linux.o compat_signal.o \ 19 + obj-$(CONFIG_COMPAT) += compat_linux.o compat_signal.o \ 17 20 compat_ioctl.o compat_wrapper.o \ 18 21 compat_exec_domain.o 19 22 obj-$(CONFIG_BINFMT_ELF32) += binfmt_elf32.o 20 - 21 - obj-$(CONFIG_ARCH_S390_31) += entry.o reipl.o 22 - obj-$(CONFIG_ARCH_S390X) += entry64.o reipl64.o 23 23 24 24 obj-$(CONFIG_VIRT_TIMER) += vtime.o 25 25 26 26 # Kexec part 27 27 S390_KEXEC_OBJS := machine_kexec.o crash.o 28 - ifeq ($(CONFIG_ARCH_S390X),y) 29 - S390_KEXEC_OBJS += relocate_kernel64.o 30 - else 31 - S390_KEXEC_OBJS += relocate_kernel.o 32 - endif 28 + S390_KEXEC_OBJS += $(if $(CONFIG_64BIT),relocate_kernel64.o,relocate_kernel.o) 33 29 obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS) 34 - 35 30 36 31 # 37 32 # This is just to get the dependencies...

+8 -8

arch/s390/kernel/cpcmd.c

··· 39 39 40 40 if (response != NULL && rlen > 0) { 41 41 memset(response, 0, rlen); 42 - #ifndef CONFIG_ARCH_S390X 42 + #ifndef CONFIG_64BIT 43 43 asm volatile ( "lra 2,0(%2)\n" 44 44 "lr 4,%3\n" 45 45 "o 4,%6\n" ··· 55 55 : "a" (cpcmd_buf), "d" (cmdlen), 56 56 "a" (response), "d" (rlen), "m" (mask) 57 57 : "cc", "2", "3", "4", "5" ); 58 - #else /* CONFIG_ARCH_S390X */ 58 + #else /* CONFIG_64BIT */ 59 59 asm volatile ( "lrag 2,0(%2)\n" 60 60 "lgr 4,%3\n" 61 61 "o 4,%6\n" ··· 73 73 : "a" (cpcmd_buf), "d" (cmdlen), 74 74 "a" (response), "d" (rlen), "m" (mask) 75 75 : "cc", "2", "3", "4", "5" ); 76 - #endif /* CONFIG_ARCH_S390X */ 76 + #endif /* CONFIG_64BIT */ 77 77 EBCASC(response, rlen); 78 78 } else { 79 79 return_len = 0; 80 - #ifndef CONFIG_ARCH_S390X 80 + #ifndef CONFIG_64BIT 81 81 asm volatile ( "lra 2,0(%1)\n" 82 82 "lr 3,%2\n" 83 83 "diag 2,3,0x8\n" ··· 85 85 : "=d" (return_code) 86 86 : "a" (cpcmd_buf), "d" (cmdlen) 87 87 : "2", "3" ); 88 - #else /* CONFIG_ARCH_S390X */ 88 + #else /* CONFIG_64BIT */ 89 89 asm volatile ( "lrag 2,0(%1)\n" 90 90 "lgr 3,%2\n" 91 91 "sam31\n" ··· 95 95 : "=d" (return_code) 96 96 : "a" (cpcmd_buf), "d" (cmdlen) 97 97 : "2", "3" ); 98 - #endif /* CONFIG_ARCH_S390X */ 98 + #endif /* CONFIG_64BIT */ 99 99 } 100 100 spin_unlock_irqrestore(&cpcmd_lock, flags); 101 101 if (response_code != NULL) ··· 105 105 106 106 EXPORT_SYMBOL(__cpcmd); 107 107 108 - #ifdef CONFIG_ARCH_S390X 108 + #ifdef CONFIG_64BIT 109 109 int cpcmd(const char *cmd, char *response, int rlen, int *response_code) 110 110 { 111 111 char *lowbuf; ··· 129 129 } 130 130 131 131 EXPORT_SYMBOL(cpcmd); 132 - #endif /* CONFIG_ARCH_S390X */ 132 + #endif /* CONFIG_64BIT */

+9 -9

arch/s390/kernel/entry64.S

··· 213 213 mvc SP_ARGS(8,%r15),SP_R7(%r15) 214 214 sysc_do_restart: 215 215 larl %r10,sys_call_table 216 - #ifdef CONFIG_S390_SUPPORT 216 + #ifdef CONFIG_COMPAT 217 217 tm __TI_flags+5(%r9),(_TIF_31BIT>>16) # running in 31 bit mode ? 218 218 jno sysc_noemu 219 219 larl %r10,sys_call_table_emu # use 31 bit emulation system calls ··· 361 361 la %r2,SP_PTREGS(%r15) # load pt_regs 362 362 jg sys_clone # branch to sys_clone 363 363 364 - #ifdef CONFIG_S390_SUPPORT 364 + #ifdef CONFIG_COMPAT 365 365 sys32_clone_glue: 366 366 la %r2,SP_PTREGS(%r15) # load pt_regs 367 367 jg sys32_clone # branch to sys32_clone ··· 383 383 bnz 0(%r12) # it did fail -> store result in gpr2 384 384 b 6(%r12) # SKIP STG 2,SP_R2(15) in 385 385 # system_call/sysc_tracesys 386 - #ifdef CONFIG_S390_SUPPORT 386 + #ifdef CONFIG_COMPAT 387 387 sys32_execve_glue: 388 388 la %r2,SP_PTREGS(%r15) # load pt_regs 389 389 lgr %r12,%r14 # save return address ··· 398 398 la %r2,SP_PTREGS(%r15) # load pt_regs as parameter 399 399 jg sys_sigreturn # branch to sys_sigreturn 400 400 401 - #ifdef CONFIG_S390_SUPPORT 401 + #ifdef CONFIG_COMPAT 402 402 sys32_sigreturn_glue: 403 403 la %r2,SP_PTREGS(%r15) # load pt_regs as parameter 404 404 jg sys32_sigreturn # branch to sys32_sigreturn ··· 408 408 la %r2,SP_PTREGS(%r15) # load pt_regs as parameter 409 409 jg sys_rt_sigreturn # branch to sys_sigreturn 410 410 411 - #ifdef CONFIG_S390_SUPPORT 411 + #ifdef CONFIG_COMPAT 412 412 sys32_rt_sigreturn_glue: 413 413 la %r2,SP_PTREGS(%r15) # load pt_regs as parameter 414 414 jg sys32_rt_sigreturn # branch to sys32_sigreturn ··· 429 429 la %r14,6(%r14) # skip store of return value 430 430 jg sys_sigsuspend # branch to sys_sigsuspend 431 431 432 - #ifdef CONFIG_S390_SUPPORT 432 + #ifdef CONFIG_COMPAT 433 433 sys32_sigsuspend_glue: 434 434 llgfr %r4,%r4 # unsigned long 435 435 lgr %r5,%r4 # move mask back ··· 449 449 la %r14,6(%r14) # skip store of return value 450 450 jg sys_rt_sigsuspend # branch to sys_rt_sigsuspend 451 451 452 - #ifdef CONFIG_S390_SUPPORT 452 + #ifdef CONFIG_COMPAT 453 453 sys32_rt_sigsuspend_glue: 454 454 llgfr %r3,%r3 # size_t 455 455 lgr %r4,%r3 # move sigsetsize parameter ··· 464 464 la %r4,SP_PTREGS(%r15) # load pt_regs as parameter 465 465 jg sys_sigaltstack # branch to sys_sigreturn 466 466 467 - #ifdef CONFIG_S390_SUPPORT 467 + #ifdef CONFIG_COMPAT 468 468 sys32_sigaltstack_glue: 469 469 la %r4,SP_PTREGS(%r15) # load pt_regs as parameter 470 470 jg sys32_sigaltstack_wrapper # branch to sys_sigreturn ··· 1009 1009 #include "syscalls.S" 1010 1010 #undef SYSCALL 1011 1011 1012 - #ifdef CONFIG_S390_SUPPORT 1012 + #ifdef CONFIG_COMPAT 1013 1013 1014 1014 #define SYSCALL(esa,esame,emu) .long emu 1015 1015 .globl sys_call_table_emu

+2 -2

arch/s390/kernel/head.S

··· 30 30 #include <asm/thread_info.h> 31 31 #include <asm/page.h> 32 32 33 - #ifdef CONFIG_ARCH_S390X 33 + #ifdef CONFIG_64BIT 34 34 #define ARCH_OFFSET 4 35 35 #else 36 36 #define ARCH_OFFSET 0 ··· 539 539 .word 0 540 540 .endm 541 541 542 - #ifdef CONFIG_ARCH_S390X 542 + #ifdef CONFIG_64BIT 543 543 #include "head64.S" 544 544 #else 545 545 #include "head31.S"

+6 -6

arch/s390/kernel/module.c

··· 37 37 #define DEBUGP(fmt , ...) 38 38 #endif 39 39 40 - #ifndef CONFIG_ARCH_S390X 40 + #ifndef CONFIG_64BIT 41 41 #define PLT_ENTRY_SIZE 12 42 - #else /* CONFIG_ARCH_S390X */ 42 + #else /* CONFIG_64BIT */ 43 43 #define PLT_ENTRY_SIZE 20 44 - #endif /* CONFIG_ARCH_S390X */ 44 + #endif /* CONFIG_64BIT */ 45 45 46 46 void *module_alloc(unsigned long size) 47 47 { ··· 294 294 unsigned int *ip; 295 295 ip = me->module_core + me->arch.plt_offset + 296 296 info->plt_offset; 297 - #ifndef CONFIG_ARCH_S390X 297 + #ifndef CONFIG_64BIT 298 298 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */ 299 299 ip[1] = 0x100607f1; 300 300 ip[2] = val; 301 - #else /* CONFIG_ARCH_S390X */ 301 + #else /* CONFIG_64BIT */ 302 302 ip[0] = 0x0d10e310; /* basr 1,0; lg 1,10(1); br 1 */ 303 303 ip[1] = 0x100a0004; 304 304 ip[2] = 0x07f10000; 305 305 ip[3] = (unsigned int) (val >> 32); 306 306 ip[4] = (unsigned int) val; 307 - #endif /* CONFIG_ARCH_S390X */ 307 + #endif /* CONFIG_64BIT */ 308 308 info->plt_initialized = 1; 309 309 } 310 310 if (r_type == R_390_PLTOFF16 ||

+6 -6

arch/s390/kernel/process.c

··· 235 235 /* Save access registers to new thread structure. */ 236 236 save_access_regs(&p->thread.acrs[0]); 237 237 238 - #ifndef CONFIG_ARCH_S390X 238 + #ifndef CONFIG_64BIT 239 239 /* 240 240 * save fprs to current->thread.fp_regs to merge them with 241 241 * the emulated registers and then copy the result to the child. ··· 247 247 /* Set a new TLS ? */ 248 248 if (clone_flags & CLONE_SETTLS) 249 249 p->thread.acrs[0] = regs->gprs[6]; 250 - #else /* CONFIG_ARCH_S390X */ 250 + #else /* CONFIG_64BIT */ 251 251 /* Save the fpu registers to new thread structure. */ 252 252 save_fp_regs(&p->thread.fp_regs); 253 253 p->thread.user_seg = __pa((unsigned long) p->mm->pgd) | _REGION_TABLE; ··· 260 260 p->thread.acrs[1] = (unsigned int) regs->gprs[6]; 261 261 } 262 262 } 263 - #endif /* CONFIG_ARCH_S390X */ 263 + #endif /* CONFIG_64BIT */ 264 264 /* start new process with ar4 pointing to the correct address space */ 265 265 p->thread.mm_segment = get_fs(); 266 266 /* Don't copy debug registers */ ··· 339 339 */ 340 340 int dump_fpu (struct pt_regs * regs, s390_fp_regs *fpregs) 341 341 { 342 - #ifndef CONFIG_ARCH_S390X 342 + #ifndef CONFIG_64BIT 343 343 /* 344 344 * save fprs to current->thread.fp_regs to merge them with 345 345 * the emulated registers and then copy the result to the dump. 346 346 */ 347 347 save_fp_regs(&current->thread.fp_regs); 348 348 memcpy(fpregs, &current->thread.fp_regs, sizeof(s390_fp_regs)); 349 - #else /* CONFIG_ARCH_S390X */ 349 + #else /* CONFIG_64BIT */ 350 350 save_fp_regs(fpregs); 351 - #endif /* CONFIG_ARCH_S390X */ 351 + #endif /* CONFIG_64BIT */ 352 352 return 1; 353 353 } 354 354

+12 -12

arch/s390/kernel/ptrace.c

··· 42 42 #include <asm/uaccess.h> 43 43 #include <asm/unistd.h> 44 44 45 - #ifdef CONFIG_S390_SUPPORT 45 + #ifdef CONFIG_COMPAT 46 46 #include "compat_ptrace.h" 47 47 #endif 48 48 ··· 59 59 60 60 if (per_info->single_step) { 61 61 per_info->control_regs.bits.starting_addr = 0; 62 - #ifdef CONFIG_S390_SUPPORT 62 + #ifdef CONFIG_COMPAT 63 63 if (test_thread_flag(TIF_31BIT)) 64 64 per_info->control_regs.bits.ending_addr = 0x7fffffffUL; 65 65 else ··· 112 112 clear_single_step(child); 113 113 } 114 114 115 - #ifndef CONFIG_ARCH_S390X 115 + #ifndef CONFIG_64BIT 116 116 # define __ADDR_MASK 3 117 117 #else 118 118 # define __ADDR_MASK 7 ··· 138 138 * an alignment of 4. Programmers from hell... 139 139 */ 140 140 mask = __ADDR_MASK; 141 - #ifdef CONFIG_ARCH_S390X 141 + #ifdef CONFIG_64BIT 142 142 if (addr >= (addr_t) &dummy->regs.acrs && 143 143 addr < (addr_t) &dummy->regs.orig_gpr2) 144 144 mask = 3; ··· 160 160 * access registers are stored in the thread structure 161 161 */ 162 162 offset = addr - (addr_t) &dummy->regs.acrs; 163 - #ifdef CONFIG_ARCH_S390X 163 + #ifdef CONFIG_64BIT 164 164 /* 165 165 * Very special case: old & broken 64 bit gdb reading 166 166 * from acrs[15]. Result is a 64 bit value. Read the ··· 218 218 * an alignment of 4. Programmers from hell indeed... 219 219 */ 220 220 mask = __ADDR_MASK; 221 - #ifdef CONFIG_ARCH_S390X 221 + #ifdef CONFIG_64BIT 222 222 if (addr >= (addr_t) &dummy->regs.acrs && 223 223 addr < (addr_t) &dummy->regs.orig_gpr2) 224 224 mask = 3; ··· 231 231 * psw and gprs are stored on the stack 232 232 */ 233 233 if (addr == (addr_t) &dummy->regs.psw.mask && 234 - #ifdef CONFIG_S390_SUPPORT 234 + #ifdef CONFIG_COMPAT 235 235 data != PSW_MASK_MERGE(PSW_USER32_BITS, data) && 236 236 #endif 237 237 data != PSW_MASK_MERGE(PSW_USER_BITS, data)) 238 238 /* Invalid psw mask. */ 239 239 return -EINVAL; 240 - #ifndef CONFIG_ARCH_S390X 240 + #ifndef CONFIG_64BIT 241 241 if (addr == (addr_t) &dummy->regs.psw.addr) 242 242 /* I'd like to reject addresses without the 243 243 high order bit but older gdb's rely on it */ ··· 250 250 * access registers are stored in the thread structure 251 251 */ 252 252 offset = addr - (addr_t) &dummy->regs.acrs; 253 - #ifdef CONFIG_ARCH_S390X 253 + #ifdef CONFIG_64BIT 254 254 /* 255 255 * Very special case: old & broken 64 bit gdb writing 256 256 * to acrs[15] with a 64 bit value. Ignore the lower ··· 357 357 return ptrace_request(child, request, addr, data); 358 358 } 359 359 360 - #ifdef CONFIG_S390_SUPPORT 360 + #ifdef CONFIG_COMPAT 361 361 /* 362 362 * Now the fun part starts... a 31 bit program running in the 363 363 * 31 bit emulation tracing another program. PTRACE_PEEKTEXT, ··· 629 629 return peek_user(child, addr, data); 630 630 if (request == PTRACE_POKEUSR && addr == PT_IEEE_IP) 631 631 return poke_user(child, addr, data); 632 - #ifdef CONFIG_S390_SUPPORT 632 + #ifdef CONFIG_COMPAT 633 633 if (request == PTRACE_PEEKUSR && 634 634 addr == PT32_IEEE_IP && test_thread_flag(TIF_31BIT)) 635 635 return peek_user_emu31(child, addr, data); ··· 695 695 696 696 /* Do requests that differ for 31/64 bit */ 697 697 default: 698 - #ifdef CONFIG_S390_SUPPORT 698 + #ifdef CONFIG_COMPAT 699 699 if (test_thread_flag(TIF_31BIT)) 700 700 return do_ptrace_emu31(child, request, addr, data); 701 701 #endif

+1 -1

arch/s390/kernel/reipl_diag.c

··· 26 26 " st %%r4,%0\n" 27 27 " st %%r5,%1\n" 28 28 ".section __ex_table,\"a\"\n" 29 - #ifdef __s390x__ 29 + #ifdef CONFIG_64BIT 30 30 " .align 8\n" 31 31 " .quad 0b, 0b\n" 32 32 #else

+7 -7

arch/s390/kernel/setup.c

··· 427 427 __alloc_bootmem(PAGE_SIZE, PAGE_SIZE, 0) + PAGE_SIZE; 428 428 lc->current_task = (unsigned long) init_thread_union.thread_info.task; 429 429 lc->thread_info = (unsigned long) &init_thread_union; 430 - #ifndef CONFIG_ARCH_S390X 430 + #ifndef CONFIG_64BIT 431 431 if (MACHINE_HAS_IEEE) { 432 432 lc->extended_save_area_addr = (__u32) 433 433 __alloc_bootmem(PAGE_SIZE, PAGE_SIZE, 0); ··· 562 562 /* 563 563 * print what head.S has found out about the machine 564 564 */ 565 - #ifndef CONFIG_ARCH_S390X 565 + #ifndef CONFIG_64BIT 566 566 printk((MACHINE_IS_VM) ? 567 567 "We are running under VM (31 bit mode)\n" : 568 568 "We are running native (31 bit mode)\n"); 569 569 printk((MACHINE_HAS_IEEE) ? 570 570 "This machine has an IEEE fpu\n" : 571 571 "This machine has no IEEE fpu\n"); 572 - #else /* CONFIG_ARCH_S390X */ 572 + #else /* CONFIG_64BIT */ 573 573 printk((MACHINE_IS_VM) ? 574 574 "We are running under VM (64 bit mode)\n" : 575 575 "We are running native (64 bit mode)\n"); 576 - #endif /* CONFIG_ARCH_S390X */ 576 + #endif /* CONFIG_64BIT */ 577 577 578 578 ROOT_DEV = Root_RAM0; 579 - #ifndef CONFIG_ARCH_S390X 579 + #ifndef CONFIG_64BIT 580 580 memory_end = memory_size & ~0x400000UL; /* align memory end to 4MB */ 581 581 /* 582 582 * We need some free virtual space to be able to do vmalloc. ··· 585 585 */ 586 586 if (memory_end > 1920*1024*1024) 587 587 memory_end = 1920*1024*1024; 588 - #else /* CONFIG_ARCH_S390X */ 588 + #else /* CONFIG_64BIT */ 589 589 memory_end = memory_size & ~0x200000UL; /* detected in head.s */ 590 - #endif /* CONFIG_ARCH_S390X */ 590 + #endif /* CONFIG_64BIT */ 591 591 592 592 init_mm.start_code = PAGE_OFFSET; 593 593 init_mm.end_code = (unsigned long) &_etext;

+1 -1

arch/s390/kernel/signal.c

··· 501 501 502 502 if (signr > 0) { 503 503 /* Whee! Actually deliver the signal. */ 504 - #ifdef CONFIG_S390_SUPPORT 504 + #ifdef CONFIG_COMPAT 505 505 if (test_thread_flag(TIF_31BIT)) { 506 506 extern void handle_signal32(unsigned long sig, 507 507 struct k_sigaction *ka,

+4 -4

arch/s390/kernel/smp.c

··· 402 402 } 403 403 } 404 404 405 - #ifndef CONFIG_ARCH_S390X 405 + #ifndef CONFIG_64BIT 406 406 /* 407 407 * this function sends a 'purge tlb' signal to another CPU. 408 408 */ ··· 416 416 on_each_cpu(smp_ptlb_callback, NULL, 0, 1); 417 417 } 418 418 EXPORT_SYMBOL(smp_ptlb_all); 419 - #endif /* ! CONFIG_ARCH_S390X */ 419 + #endif /* ! CONFIG_64BIT */ 420 420 421 421 /* 422 422 * this function sends a 'reschedule' IPI to another CPU. ··· 783 783 if (stack == 0ULL) 784 784 panic("smp_boot_cpus failed to allocate memory\n"); 785 785 lowcore_ptr[i]->panic_stack = stack + (PAGE_SIZE); 786 - #ifndef __s390x__ 786 + #ifndef CONFIG_64BIT 787 787 if (MACHINE_HAS_IEEE) { 788 788 lowcore_ptr[i]->extended_save_area_addr = 789 789 (__u32) __get_free_pages(GFP_KERNEL,0); ··· 793 793 } 794 794 #endif 795 795 } 796 - #ifndef __s390x__ 796 + #ifndef CONFIG_64BIT 797 797 if (MACHINE_HAS_IEEE) 798 798 ctl_set_bit(14, 29); /* enable extended save area */ 799 799 #endif

+5 -7

arch/s390/kernel/sys_s390.c

··· 26 26 #include <linux/mman.h> 27 27 #include <linux/file.h> 28 28 #include <linux/utsname.h> 29 - #ifdef CONFIG_ARCH_S390X 30 29 #include <linux/personality.h> 31 - #endif /* CONFIG_ARCH_S390X */ 32 30 33 31 #include <asm/uaccess.h> 34 32 #include <asm/ipc.h> ··· 119 121 return error; 120 122 } 121 123 122 - #ifndef CONFIG_ARCH_S390X 124 + #ifndef CONFIG_64BIT 123 125 struct sel_arg_struct { 124 126 unsigned long n; 125 127 fd_set *inp, *outp, *exp; ··· 136 138 return sys_select(a.n, a.inp, a.outp, a.exp, a.tvp); 137 139 138 140 } 139 - #endif /* CONFIG_ARCH_S390X */ 141 + #endif /* CONFIG_64BIT */ 140 142 141 143 /* 142 144 * sys_ipc() is the de-multiplexer for the SysV IPC calls.. ··· 209 211 return -EINVAL; 210 212 } 211 213 212 - #ifdef CONFIG_ARCH_S390X 214 + #ifdef CONFIG_64BIT 213 215 asmlinkage long s390x_newuname(struct new_utsname __user *name) 214 216 { 215 217 int ret = sys_newuname(name); ··· 233 235 234 236 return ret; 235 237 } 236 - #endif /* CONFIG_ARCH_S390X */ 238 + #endif /* CONFIG_64BIT */ 237 239 238 240 /* 239 241 * Wrapper function for sys_fadvise64/fadvise64_64 240 242 */ 241 - #ifndef CONFIG_ARCH_S390X 243 + #ifndef CONFIG_64BIT 242 244 243 245 asmlinkage long 244 246 s390_fadvise64(int fd, u32 offset_high, u32 offset_low, size_t len, int advice)

+5 -5

arch/s390/kernel/traps.c

··· 67 67 68 68 #define stack_pointer ({ void **sp; asm("la %0,0(15)" : "=&d" (sp)); sp; }) 69 69 70 - #ifndef CONFIG_ARCH_S390X 70 + #ifndef CONFIG_64BIT 71 71 #define FOURLONG "%08lx %08lx %08lx %08lx\n" 72 72 static int kstack_depth_to_print = 12; 73 - #else /* CONFIG_ARCH_S390X */ 73 + #else /* CONFIG_64BIT */ 74 74 #define FOURLONG "%016lx %016lx %016lx %016lx\n" 75 75 static int kstack_depth_to_print = 20; 76 - #endif /* CONFIG_ARCH_S390X */ 76 + #endif /* CONFIG_64BIT */ 77 77 78 78 /* 79 79 * For show_trace we have tree different stack to consider: ··· 702 702 pgm_check_table[0x11] = &do_dat_exception; 703 703 pgm_check_table[0x12] = &translation_exception; 704 704 pgm_check_table[0x13] = &special_op_exception; 705 - #ifdef CONFIG_ARCH_S390X 705 + #ifdef CONFIG_64BIT 706 706 pgm_check_table[0x38] = &do_dat_exception; 707 707 pgm_check_table[0x39] = &do_dat_exception; 708 708 pgm_check_table[0x3A] = &do_dat_exception; 709 709 pgm_check_table[0x3B] = &do_dat_exception; 710 - #endif /* CONFIG_ARCH_S390X */ 710 + #endif /* CONFIG_64BIT */ 711 711 pgm_check_table[0x15] = &operand_exception; 712 712 pgm_check_table[0x1C] = &space_switch_exception; 713 713 pgm_check_table[0x1D] = &hfp_sqrt_exception;

+1 -1

arch/s390/kernel/vmlinux.lds.S

··· 5 5 #include <asm-generic/vmlinux.lds.h> 6 6 #include <linux/config.h> 7 7 8 - #ifndef CONFIG_ARCH_S390X 8 + #ifndef CONFIG_64BIT 9 9 OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") 10 10 OUTPUT_ARCH(s390) 11 11 ENTRY(_start)

+2 -3

arch/s390/lib/Makefile

··· 4 4 5 5 EXTRA_AFLAGS := -traditional 6 6 7 - lib-y += delay.o string.o 8 - lib-$(CONFIG_ARCH_S390_31) += uaccess.o spinlock.o 9 - lib-$(CONFIG_ARCH_S390X) += uaccess64.o spinlock.o 7 + lib-y += delay.o string.o spinlock.o 8 + lib-y += $(if $(CONFIG_64BIT),uaccess64.o,uaccess.o)

+1 -1

arch/s390/lib/spinlock.c

··· 29 29 static inline void 30 30 _diag44(void) 31 31 { 32 - #ifdef __s390x__ 32 + #ifdef CONFIG_64BIT 33 33 if (MACHINE_HAS_DIAG44) 34 34 #endif 35 35 asm volatile("diag 0,0,0x44");

+1 -1

arch/s390/mm/extmem.c

··· 143 143 rx = (unsigned long) parameter; 144 144 ry = (unsigned long) func; 145 145 __asm__ __volatile__( 146 - #ifdef CONFIG_ARCH_S390X 146 + #ifdef CONFIG_64BIT 147 147 " sam31\n" // switch to 31 bit 148 148 " diag %0,%1,0x64\n" 149 149 " sam64\n" // switch back to 64 bit

+9 -9

arch/s390/mm/fault.c

··· 31 31 #include <asm/uaccess.h> 32 32 #include <asm/pgtable.h> 33 33 34 - #ifndef CONFIG_ARCH_S390X 34 + #ifndef CONFIG_64BIT 35 35 #define __FAIL_ADDR_MASK 0x7ffff000 36 36 #define __FIXUP_MASK 0x7fffffff 37 37 #define __SUBCODE_MASK 0x0200 38 38 #define __PF_RES_FIELD 0ULL 39 - #else /* CONFIG_ARCH_S390X */ 39 + #else /* CONFIG_64BIT */ 40 40 #define __FAIL_ADDR_MASK -4096L 41 41 #define __FIXUP_MASK ~0L 42 42 #define __SUBCODE_MASK 0x0600 43 43 #define __PF_RES_FIELD 0x8000000000000000ULL 44 - #endif /* CONFIG_ARCH_S390X */ 44 + #endif /* CONFIG_64BIT */ 45 45 46 46 #ifdef CONFIG_SYSCTL 47 47 extern int sysctl_userprocess_debug; ··· 393 393 "2:\n" 394 394 ".section __ex_table,\"a\"\n" 395 395 " .align 4\n" 396 - #ifndef CONFIG_ARCH_S390X 396 + #ifndef CONFIG_64BIT 397 397 " .long 0b,1b\n" 398 - #else /* CONFIG_ARCH_S390X */ 398 + #else /* CONFIG_64BIT */ 399 399 " .quad 0b,1b\n" 400 - #endif /* CONFIG_ARCH_S390X */ 400 + #endif /* CONFIG_64BIT */ 401 401 ".previous" 402 402 : "=d" (rc) : "a" (&refbk), "m" (refbk) : "cc" ); 403 403 __ctl_set_bit(0, 9); ··· 417 417 "0:\n" 418 418 ".section __ex_table,\"a\"\n" 419 419 " .align 4\n" 420 - #ifndef CONFIG_ARCH_S390X 420 + #ifndef CONFIG_64BIT 421 421 " .long 0b,0b\n" 422 - #else /* CONFIG_ARCH_S390X */ 422 + #else /* CONFIG_64BIT */ 423 423 " .quad 0b,0b\n" 424 - #endif /* CONFIG_ARCH_S390X */ 424 + #endif /* CONFIG_64BIT */ 425 425 ".previous" 426 426 : : "a" (&refbk), "m" (refbk) : "cc" ); 427 427 }

+4 -4

arch/s390/mm/init.c

··· 44 44 { 45 45 if (addr >= 0x7ff00000) 46 46 return; 47 - #ifdef __s390x__ 47 + #ifdef CONFIG_64BIT 48 48 asm volatile ( 49 49 " sam31\n" 50 50 " diag %0,%0,0x10\n" ··· 106 106 * paging_init() sets up the page tables 107 107 */ 108 108 109 - #ifndef CONFIG_ARCH_S390X 109 + #ifndef CONFIG_64BIT 110 110 void __init paging_init(void) 111 111 { 112 112 pgd_t * pg_dir; ··· 175 175 return; 176 176 } 177 177 178 - #else /* CONFIG_ARCH_S390X */ 178 + #else /* CONFIG_64BIT */ 179 179 void __init paging_init(void) 180 180 { 181 181 pgd_t * pg_dir; ··· 256 256 257 257 return; 258 258 } 259 - #endif /* CONFIG_ARCH_S390X */ 259 + #endif /* CONFIG_64BIT */ 260 260 261 261 void __init mem_init(void) 262 262 {

+1 -1

arch/s390/mm/mmap.c

··· 50 50 51 51 static inline int mmap_is_legacy(void) 52 52 { 53 - #ifdef CONFIG_ARCH_S390X 53 + #ifdef CONFIG_64BIT 54 54 /* 55 55 * Force standard allocation for 64 bit programs. 56 56 */

+1 -1

block/Kconfig

··· 5 5 #for instance. 6 6 config LBD 7 7 bool "Support for Large Block Devices" 8 - depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML 8 + depends on X86 || (MIPS && 32BIT) || PPC32 || (S390 && !64BIT) || SUPERH || UML 9 9 help 10 10 Say Y here if you want to attach large (bigger than 2TB) discs to 11 11 your machine, or if you want to have a raid or loopback device

+4 -4

crypto/Kconfig

··· 42 42 43 43 config CRYPTO_SHA1_S390 44 44 tristate "SHA1 digest algorithm (s390)" 45 - depends on CRYPTO && ARCH_S390 45 + depends on CRYPTO && S390 46 46 help 47 47 This is the s390 hardware accelerated implementation of the 48 48 SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2). ··· 58 58 59 59 config CRYPTO_SHA256_S390 60 60 tristate "SHA256 digest algorithm (s390)" 61 - depends on CRYPTO && ARCH_S390 61 + depends on CRYPTO && S390 62 62 help 63 63 This is the s390 hardware accelerated implementation of the 64 64 SHA256 secure hash standard (DFIPS 180-2). ··· 111 111 112 112 config CRYPTO_DES_S390 113 113 tristate "DES and Triple DES cipher algorithms (s390)" 114 - depends on CRYPTO && ARCH_S390 114 + depends on CRYPTO && S390 115 115 help 116 116 DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3). 117 117 ··· 217 217 218 218 config CRYPTO_AES_S390 219 219 tristate "AES cipher algorithms (s390)" 220 - depends on CRYPTO && ARCH_S390 220 + depends on CRYPTO && S390 221 221 help 222 222 This is the s390 hardware accelerated implementation of the 223 223 AES cipher algorithms (FIPS-197). AES uses the Rijndael

+1 -1

drivers/char/Kconfig

··· 985 985 986 986 config HANGCHECK_TIMER 987 987 tristate "Hangcheck timer" 988 - depends on X86 || IA64 || PPC64 || ARCH_S390 988 + depends on X86 || IA64 || PPC64 || S390 989 989 help 990 990 The hangcheck-timer module detects when the system has gone 991 991 out to lunch past a certain margin. It can reboot the system

+1 -1

drivers/char/hangcheck-timer.c

··· 120 120 #if defined(CONFIG_X86) 121 121 # define HAVE_MONOTONIC 122 122 # define TIMER_FREQ 1000000000ULL 123 - #elif defined(CONFIG_ARCH_S390) 123 + #elif defined(CONFIG_S390) 124 124 /* FA240000 is 1 Second in the IBM time universe (Page 4-38 Principles of Op for zSeries */ 125 125 # define TIMER_FREQ 0xFA240000ULL 126 126 #elif defined(CONFIG_IA64)

+1 -1

drivers/char/watchdog/Kconfig

··· 438 438 439 439 config ZVM_WATCHDOG 440 440 tristate "z/VM Watchdog Timer" 441 - depends on WATCHDOG && ARCH_S390 441 + depends on WATCHDOG && S390 442 442 help 443 443 IBM s/390 and zSeries machines running under z/VM 5.1 or later 444 444 provide a virtual watchdog timer to their guest that cause a

+1 -1

drivers/input/evdev.c

··· 157 157 # define COMPAT_TEST test_thread_flag(TIF_IA32) 158 158 #elif defined(CONFIG_IA64) 159 159 # define COMPAT_TEST IS_IA32_PROCESS(ia64_task_regs(current)) 160 - #elif defined(CONFIG_ARCH_S390) 160 + #elif defined(CONFIG_S390) 161 161 # define COMPAT_TEST test_thread_flag(TIF_31BIT) 162 162 #elif defined(CONFIG_MIPS) 163 163 # define COMPAT_TEST (current->thread.mflags & MF_32BIT_ADDR)

+1 -1

drivers/net/phy/Kconfig

··· 6 6 7 7 config PHYLIB 8 8 tristate "PHY Device support and infrastructure" 9 - depends on NET_ETHERNET && (BROKEN || !ARCH_S390) 9 + depends on NET_ETHERNET && (BROKEN || !S390) 10 10 help 11 11 Ethernet controllers are usually attached to PHY 12 12 devices. This option provides infrastructure for

+4 -4

drivers/s390/block/Kconfig

··· 1 - if ARCH_S390 1 + if S390 2 2 3 3 comment "S/390 block device drivers" 4 - depends on ARCH_S390 4 + depends on S390 5 5 6 6 config BLK_DEV_XPRAM 7 7 tristate "XPRAM disk support" 8 - depends on ARCH_S390 8 + depends on S390 9 9 help 10 10 Select this option if you want to use your expanded storage on S/390 11 11 or zSeries as a disk. This is useful as a _fast_ swap device if you ··· 49 49 50 50 config DASD_DIAG 51 51 tristate "Support for DIAG access to Disks" 52 - depends on DASD && ( ARCH_S390X = 'n' || EXPERIMENTAL) 52 + depends on DASD && ( 64BIT = 'n' || EXPERIMENTAL) 53 53 help 54 54 Select this option if you want to use Diagnose250 command to access 55 55 Disks under VM. If you are not running under VM or unsure what it is,

+1 -1

drivers/s390/block/dasd.c

··· 604 604 void 605 605 dasd_kfree_request(struct dasd_ccw_req * cqr, struct dasd_device * device) 606 606 { 607 - #ifdef CONFIG_ARCH_S390X 607 + #ifdef CONFIG_64BIT 608 608 struct ccw1 *ccw; 609 609 610 610 /* Clear any idals used for the request. */

+1 -1

drivers/s390/block/dasd_diag.c

··· 75 75 int rc; 76 76 77 77 __asm__ __volatile__( 78 - #ifdef CONFIG_ARCH_S390X 78 + #ifdef CONFIG_64BIT 79 79 " lghi %0,3\n" 80 80 " lgr 0,%3\n" 81 81 " diag 0,%2,0x250\n"

+3 -3

drivers/s390/block/dasd_diag.h

··· 45 45 } __attribute__ ((packed, aligned(4))); 46 46 47 47 48 - #ifdef CONFIG_ARCH_S390X 48 + #ifdef CONFIG_64BIT 49 49 #define DASD_DIAG_FLAGA_DEFAULT DASD_DIAG_FLAGA_FORMAT_64BIT 50 50 51 51 typedef u64 blocknum_t; ··· 86 86 struct dasd_diag_bio *bio_list; 87 87 u8 spare4[8]; 88 88 } __attribute__ ((packed, aligned(8))); 89 - #else /* CONFIG_ARCH_S390X */ 89 + #else /* CONFIG_64BIT */ 90 90 #define DASD_DIAG_FLAGA_DEFAULT 0x0 91 91 92 92 typedef u32 blocknum_t; ··· 125 125 u32 interrupt_params; 126 126 u8 spare3[20]; 127 127 } __attribute__ ((packed, aligned(8))); 128 - #endif /* CONFIG_ARCH_S390X */ 128 + #endif /* CONFIG_64BIT */

+1 -1

drivers/s390/block/dasd_eckd.c

··· 1041 1041 /* Eckd can only do full blocks. */ 1042 1042 return ERR_PTR(-EINVAL); 1043 1043 count += bv->bv_len >> (device->s2b_shift + 9); 1044 - #if defined(CONFIG_ARCH_S390X) 1044 + #if defined(CONFIG_64BIT) 1045 1045 if (idal_is_needed (page_address(bv->bv_page), 1046 1046 bv->bv_len)) 1047 1047 cidaw += bv->bv_len >> (device->s2b_shift + 9);

+1 -1

drivers/s390/block/dasd_fba.c

··· 271 271 /* Fba can only do full blocks. */ 272 272 return ERR_PTR(-EINVAL); 273 273 count += bv->bv_len >> (device->s2b_shift + 9); 274 - #if defined(CONFIG_ARCH_S390X) 274 + #if defined(CONFIG_64BIT) 275 275 if (idal_is_needed (page_address(bv->bv_page), 276 276 bv->bv_len)) 277 277 cidaw += bv->bv_len / blksize;

+2 -2

drivers/s390/block/xpram.c

··· 160 160 "0: ipm %0\n" 161 161 " srl %0,28\n" 162 162 "1:\n" 163 - #ifndef CONFIG_ARCH_S390X 163 + #ifndef CONFIG_64BIT 164 164 ".section __ex_table,\"a\"\n" 165 165 " .align 4\n" 166 166 " .long 0b,1b\n" ··· 208 208 "0: ipm %0\n" 209 209 " srl %0,28\n" 210 210 "1:\n" 211 - #ifndef CONFIG_ARCH_S390X 211 + #ifndef CONFIG_64BIT 212 212 ".section __ex_table,\"a\"\n" 213 213 " .align 4\n" 214 214 " .long 0b,1b\n"

+1 -1

drivers/s390/char/vmwatchdog.c

··· 66 66 __cmdl = len; 67 67 err = 0; 68 68 asm volatile ( 69 - #ifdef __s390x__ 69 + #ifdef CONFIG_64BIT 70 70 "diag %2,%4,0x288\n" 71 71 "1: \n" 72 72 ".section .fixup,\"ax\"\n"

+1 -1

drivers/s390/cio/cio.c

··· 195 195 sch->orb.spnd = sch->options.suspend; 196 196 sch->orb.ssic = sch->options.suspend && sch->options.inter; 197 197 sch->orb.lpm = (lpm != 0) ? (lpm & sch->opm) : sch->lpm; 198 - #ifdef CONFIG_ARCH_S390X 198 + #ifdef CONFIG_64BIT 199 199 /* 200 200 * for 64 bit we always support 64 bit IDAWs with 4k page size only 201 201 */

+1 -1

drivers/s390/cio/device_id.c

··· 27 27 /* 28 28 * diag210 is used under VM to get information about a virtual device 29 29 */ 30 - #ifdef CONFIG_ARCH_S390X 30 + #ifdef CONFIG_64BIT 31 31 int 32 32 diag210(struct diag210 * addr) 33 33 {

+2 -2

drivers/s390/cio/ioasm.h

··· 50 50 "0: ipm %0\n" 51 51 " srl %0,28\n" 52 52 "1:\n" 53 - #ifdef CONFIG_ARCH_S390X 53 + #ifdef CONFIG_64BIT 54 54 ".section __ex_table,\"a\"\n" 55 55 " .align 8\n" 56 56 " .quad 0b,1b\n" ··· 95 95 "0: ipm %0\n" 96 96 " srl %0,28\n" 97 97 "1:\n" 98 - #ifdef CONFIG_ARCH_S390X 98 + #ifdef CONFIG_64BIT 99 99 ".section __ex_table,\"a\"\n" 100 100 " .align 8\n" 101 101 " .quad 0b,1b\n"

+1 -1

drivers/s390/cio/qdio.c

··· 2394 2394 sprintf(dbf_text,"hydrati%1x", hydra_thinints); 2395 2395 QDIO_DBF_TEXT0(0,setup,dbf_text); 2396 2396 2397 - #ifdef CONFIG_ARCH_S390X 2397 + #ifdef CONFIG_64BIT 2398 2398 /* Check for QEBSM support in general (bit 58). */ 2399 2399 is_passthrough = css_general_characteristics.qebsm; 2400 2400 #endif

+17 -17

drivers/s390/cio/qdio.h

··· 271 271 do_sqbs(unsigned long sch, unsigned char state, int queue, 272 272 unsigned int *start, unsigned int *count) 273 273 { 274 - #ifdef CONFIG_ARCH_S390X 274 + #ifdef CONFIG_64BIT 275 275 register unsigned long _ccq asm ("0") = *count; 276 276 register unsigned long _sch asm ("1") = sch; 277 277 unsigned long _queuestart = ((unsigned long)queue << 32) | *start; ··· 295 295 do_eqbs(unsigned long sch, unsigned char *state, int queue, 296 296 unsigned int *start, unsigned int *count) 297 297 { 298 - #ifdef CONFIG_ARCH_S390X 298 + #ifdef CONFIG_64BIT 299 299 register unsigned long _ccq asm ("0") = *count; 300 300 register unsigned long _sch asm ("1") = sch; 301 301 unsigned long _queuestart = ((unsigned long)queue << 32) | *start; ··· 323 323 { 324 324 int cc; 325 325 326 - #ifndef CONFIG_ARCH_S390X 326 + #ifndef CONFIG_64BIT 327 327 asm volatile ( 328 328 "lhi 0,2 \n\t" 329 329 "lr 1,%1 \n\t" ··· 336 336 : "d" (schid), "d" (mask1), "d" (mask2) 337 337 : "cc", "0", "1", "2", "3" 338 338 ); 339 - #else /* CONFIG_ARCH_S390X */ 339 + #else /* CONFIG_64BIT */ 340 340 asm volatile ( 341 341 "lghi 0,2 \n\t" 342 342 "llgfr 1,%1 \n\t" ··· 349 349 : "d" (schid), "d" (mask1), "d" (mask2) 350 350 : "cc", "0", "1", "2", "3" 351 351 ); 352 - #endif /* CONFIG_ARCH_S390X */ 352 + #endif /* CONFIG_64BIT */ 353 353 return cc; 354 354 } 355 355 ··· 358 358 { 359 359 int cc; 360 360 361 - #ifndef CONFIG_ARCH_S390X 361 + #ifndef CONFIG_64BIT 362 362 asm volatile ( 363 363 "lhi 0,1 \n\t" 364 364 "lr 1,%1 \n\t" ··· 370 370 : "d" (schid), "d" (mask) 371 371 : "cc", "0", "1", "2", "memory" 372 372 ); 373 - #else /* CONFIG_ARCH_S390X */ 373 + #else /* CONFIG_64BIT */ 374 374 asm volatile ( 375 375 "lghi 0,1 \n\t" 376 376 "llgfr 1,%1 \n\t" ··· 382 382 : "d" (schid), "d" (mask) 383 383 : "cc", "0", "1", "2", "memory" 384 384 ); 385 - #endif /* CONFIG_ARCH_S390X */ 385 + #endif /* CONFIG_64BIT */ 386 386 387 387 return cc; 388 388 } ··· 394 394 int cc; 395 395 __u32 busy_bit; 396 396 397 - #ifndef CONFIG_ARCH_S390X 397 + #ifndef CONFIG_64BIT 398 398 asm volatile ( 399 399 "lhi 0,0 \n\t" 400 400 "lr 1,%2 \n\t" ··· 424 424 "i" (QDIO_SIGA_ERROR_ACCESS_EXCEPTION) 425 425 : "cc", "0", "1", "2", "memory" 426 426 ); 427 - #else /* CONFIG_ARCH_S390X */ 427 + #else /* CONFIG_64BIT */ 428 428 asm volatile ( 429 429 "llgfr 0,%5 \n\t" 430 430 "lgr 1,%2 \n\t" ··· 449 449 "i" (QDIO_SIGA_ERROR_ACCESS_EXCEPTION), "d" (fc) 450 450 : "cc", "0", "1", "2", "memory" 451 451 ); 452 - #endif /* CONFIG_ARCH_S390X */ 452 + #endif /* CONFIG_64BIT */ 453 453 454 454 (*bb) = busy_bit; 455 455 return cc; ··· 461 461 462 462 unsigned long time; 463 463 464 - #ifndef CONFIG_ARCH_S390X 464 + #ifndef CONFIG_64BIT 465 465 asm volatile ( 466 466 "lhi 1,3 \n\t" 467 467 ".insn rre,0xb2650000,2,0 \n\t" 468 468 "lr %0,3 \n\t" 469 469 : "=d" (time) : : "cc", "1", "2", "3" 470 470 ); 471 - #else /* CONFIG_ARCH_S390X */ 471 + #else /* CONFIG_64BIT */ 472 472 asm volatile ( 473 473 "lghi 1,3 \n\t" 474 474 ".insn rre,0xb2650000,2,0 \n\t" 475 475 "lgr %0,3 \n\t" 476 476 : "=d" (time) : : "cc", "1", "2", "3" 477 477 ); 478 - #endif /* CONFIG_ARCH_S390X */ 478 + #endif /* CONFIG_64BIT */ 479 479 480 480 return time; 481 481 } ··· 542 542 543 543 #define MY_MODULE_STRING(x) #x 544 544 545 - #ifdef CONFIG_ARCH_S390X 545 + #ifdef CONFIG_64BIT 546 546 #define QDIO_GET_ADDR(x) ((__u32)(unsigned long)x) 547 - #else /* CONFIG_ARCH_S390X */ 547 + #else /* CONFIG_64BIT */ 548 548 #define QDIO_GET_ADDR(x) ((__u32)(long)x) 549 - #endif /* CONFIG_ARCH_S390X */ 549 + #endif /* CONFIG_64BIT */ 550 550 551 551 struct qdio_q { 552 552 volatile struct slsb slsb;

+4 -4

drivers/s390/crypto/z90hardware.c

··· 785 785 int ccode; 786 786 787 787 asm volatile 788 - #ifdef __s390x__ 788 + #ifdef CONFIG_64BIT 789 789 (" llgfr 0,%4 \n" 790 790 " slgr 1,1 \n" 791 791 " lgr 2,1 \n" ··· 855 855 int ccode; 856 856 857 857 asm volatile 858 - #ifdef __s390x__ 858 + #ifdef CONFIG_64BIT 859 859 (" llgfr 0,%2 \n" 860 860 " lghi 1,1 \n" 861 861 " sll 1,24 \n" ··· 921 921 int ccode; 922 922 923 923 asm volatile 924 - #ifdef __s390x__ 924 + #ifdef CONFIG_64BIT 925 925 (" lgr 6,%3 \n" 926 926 " llgfr 7,%2 \n" 927 927 " llgt 0,0(6) \n" ··· 1000 1000 int ccode; 1001 1001 1002 1002 asm volatile 1003 - #ifdef __s390x__ 1003 + #ifdef CONFIG_64BIT 1004 1004 (" llgfr 0,%2 \n" 1005 1005 " lgr 3,%4 \n" 1006 1006 " lgr 6,%3 \n"

+1 -1

drivers/s390/net/Kconfig

··· 1 1 menu "S/390 network device drivers" 2 - depends on NETDEVICES && ARCH_S390 2 + depends on NETDEVICES && S390 3 3 4 4 config LCS 5 5 tristate "Lan Channel Station Interface"

+3 -3

drivers/s390/net/claw.c

··· 1603 1603 __u32 ct, sw, rm, dup; 1604 1604 char *ptr, *rptr; 1605 1605 char tbuf[82], tdup[82]; 1606 - #if (CONFIG_ARCH_S390X) 1606 + #if (CONFIG_64BIT) 1607 1607 char addr[22]; 1608 1608 #else 1609 1609 char addr[12]; ··· 1619 1619 dup = 0; 1620 1620 for ( ct=0; ct < len; ct++, ptr++, rptr++ ) { 1621 1621 if (sw == 0) { 1622 - #if (CONFIG_ARCH_S390X) 1622 + #if (CONFIG_64BIT) 1623 1623 sprintf(addr, "%16.16lX",(unsigned long)rptr); 1624 1624 #else 1625 1625 sprintf(addr, "%8.8X",(__u32)rptr); ··· 1634 1634 if (sw == 8) { 1635 1635 strcat(bhex, " "); 1636 1636 } 1637 - #if (CONFIG_ARCH_S390X) 1637 + #if (CONFIG_64BIT) 1638 1638 sprintf(tbuf,"%2.2lX", (unsigned long)*ptr); 1639 1639 #else 1640 1640 sprintf(tbuf,"%2.2X", (__u32)*ptr);

+5 -5

drivers/s390/s390mach.c

··· 246 246 */ 247 247 kill_task = 1; 248 248 249 - #ifndef __s390x__ 249 + #ifndef CONFIG_64BIT 250 250 asm volatile("ld 0,0(%0)\n" 251 251 "ld 2,8(%0)\n" 252 252 "ld 4,16(%0)\n" ··· 255 255 #endif 256 256 257 257 if (MACHINE_HAS_IEEE) { 258 - #ifdef __s390x__ 258 + #ifdef CONFIG_64BIT 259 259 fpt_save_area = &S390_lowcore.floating_pt_save_area; 260 260 fpt_creg_save_area = &S390_lowcore.fpt_creg_save_area; 261 261 #else ··· 314 314 */ 315 315 s390_handle_damage("invalid control registers."); 316 316 else 317 - #ifdef __s390x__ 317 + #ifdef CONFIG_64BIT 318 318 asm volatile("lctlg 0,15,0(%0)" 319 319 : : "a" (&S390_lowcore.cregs_save_area)); 320 320 #else ··· 327 327 * can't write something sensible into that register. 328 328 */ 329 329 330 - #ifdef __s390x__ 330 + #ifdef CONFIG_64BIT 331 331 /* 332 332 * See if we can revalidate the TOD programmable register with its 333 333 * old contents (should be zero) otherwise set it to zero. ··· 384 384 if (mci->b) { 385 385 /* Processing backup -> verify if we can survive this */ 386 386 u64 z_mcic, o_mcic, t_mcic; 387 - #ifdef __s390x__ 387 + #ifdef CONFIG_64BIT 388 388 z_mcic = (1ULL<<63 | 1ULL<<59 | 1ULL<<29); 389 389 o_mcic = (1ULL<<43 | 1ULL<<42 | 1ULL<<41 | 1ULL<<40 | 390 390 1ULL<<36 | 1ULL<<35 | 1ULL<<34 | 1ULL<<32 |

+1 -1

drivers/s390/sysinfo.c

··· 106 106 { 107 107 int cc, retv; 108 108 109 - #ifndef CONFIG_ARCH_S390X 109 + #ifndef CONFIG_64BIT 110 110 __asm__ __volatile__ ( "lr\t0,%2\n" 111 111 "\tlr\t1,%3\n" 112 112 "\tstsi\t0(%4)\n"

+1 -1

drivers/scsi/Kconfig

··· 1815 1815 1816 1816 config ZFCP 1817 1817 tristate "FCP host bus adapter driver for IBM eServer zSeries" 1818 - depends on ARCH_S390 && QDIO && SCSI 1818 + depends on S390 && QDIO && SCSI 1819 1819 select SCSI_FC_ATTRS 1820 1820 help 1821 1821 If you want to access SCSI devices attached to your IBM eServer

+1 -1

fs/partitions/Kconfig

··· 85 85 86 86 config IBM_PARTITION 87 87 bool "IBM disk label and partition support" 88 - depends on PARTITION_ADVANCED && ARCH_S390 88 + depends on PARTITION_ADVANCED && S390 89 89 help 90 90 Say Y here if you would like to be able to read the hard disk 91 91 partition table format used by IBM DASD disks operating under CMS.

+1 -1

fs/proc/array.c

··· 308 308 buffer = task_sig(task, buffer); 309 309 buffer = task_cap(task, buffer); 310 310 buffer = cpuset_task_status_allowed(task, buffer); 311 - #if defined(CONFIG_ARCH_S390) 311 + #if defined(CONFIG_S390) 312 312 buffer = task_show_regs(task, buffer); 313 313 #endif 314 314 return buffer - orig;

+1 -1

include/asm-s390/unistd.h

··· 539 539 #define __ARCH_WANT_SYS_SIGPENDING 540 540 #define __ARCH_WANT_SYS_SIGPROCMASK 541 541 #define __ARCH_WANT_SYS_RT_SIGACTION 542 - # ifdef CONFIG_ARCH_S390_31 542 + # ifndef CONFIG_64BIT 543 543 # define __ARCH_WANT_STAT64 544 544 # define __ARCH_WANT_SYS_TIME 545 545 # endif

+1 -1

include/linux/irq.h

··· 12 12 #include <linux/config.h> 13 13 #include <linux/smp.h> 14 14 15 - #if !defined(CONFIG_ARCH_S390) 15 + #if !defined(CONFIG_S390) 16 16 17 17 #include <linux/linkage.h> 18 18 #include <linux/cache.h>

+1 -1

init/Kconfig

··· 189 189 190 190 config AUDITSYSCALL 191 191 bool "Enable system-call auditing support" 192 - depends on AUDIT && (X86 || PPC || PPC64 || ARCH_S390 || IA64 || UML || SPARC64) 192 + depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64) 193 193 default y if SECURITY_SELINUX 194 194 help 195 195 Enable low-overhead system-call auditing infrastructure that

+2 -2

init/do_mounts_rd.c

··· 145 145 int nblocks, i, disk; 146 146 char *buf = NULL; 147 147 unsigned short rotate = 0; 148 - #if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_PPC_ISERIES) 148 + #if !defined(CONFIG_S390) && !defined(CONFIG_PPC_ISERIES) 149 149 char rotator[4] = { '|' , '/' , '-' , '\\' }; 150 150 #endif 151 151 ··· 237 237 } 238 238 sys_read(in_fd, buf, BLOCK_SIZE); 239 239 sys_write(out_fd, buf, BLOCK_SIZE); 240 - #if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_PPC_ISERIES) 240 + #if !defined(CONFIG_S390) && !defined(CONFIG_PPC_ISERIES) 241 241 if (!(i % 16)) { 242 242 printk("%c\b", rotator[rotate & 0x3]); 243 243 rotate++;

+2 -2

kernel/panic.c

··· 60 60 long i; 61 61 static char buf[1024]; 62 62 va_list args; 63 - #if defined(CONFIG_ARCH_S390) 63 + #if defined(CONFIG_S390) 64 64 unsigned long caller = (unsigned long) __builtin_return_address(0); 65 65 #endif 66 66 ··· 125 125 printk(KERN_EMERG "Press Stop-A (L1-A) to return to the boot prom\n"); 126 126 } 127 127 #endif 128 - #if defined(CONFIG_ARCH_S390) 128 + #if defined(CONFIG_S390) 129 129 disabled_wait(caller); 130 130 #endif 131 131 local_irq_enable();

+3 -3

kernel/sysctl.c

··· 108 108 extern int unaligned_enabled; 109 109 #endif 110 110 111 - #ifdef CONFIG_ARCH_S390 111 + #ifdef CONFIG_S390 112 112 #ifdef CONFIG_MATHEMU 113 113 extern int sysctl_ieee_emulation_warnings; 114 114 #endif ··· 542 542 .extra1 = &minolduid, 543 543 .extra2 = &maxolduid, 544 544 }, 545 - #ifdef CONFIG_ARCH_S390 545 + #ifdef CONFIG_S390 546 546 #ifdef CONFIG_MATHEMU 547 547 { 548 548 .ctl_name = KERN_IEEE_EMULATION_WARNINGS, ··· 644 644 .mode = 0644, 645 645 .proc_handler = &proc_dointvec, 646 646 }, 647 - #if defined(CONFIG_ARCH_S390) 647 + #if defined(CONFIG_S390) 648 648 { 649 649 .ctl_name = KERN_SPIN_RETRY, 650 650 .procname = "spin_retry",

+1 -1

lib/Kconfig.debug

··· 32 32 config LOG_BUF_SHIFT 33 33 int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL 34 34 range 12 21 35 - default 17 if ARCH_S390 35 + default 17 if S390 36 36 default 16 if X86_NUMAQ || IA64 37 37 default 15 if SMP 38 38 default 14