diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-09-24 03:14:56 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-10-24 11:16:57 -0400 |
commit | e258d719ff28ecc7a048eb8f78380e68c4b3a3f0 (patch) | |
tree | 1c7f496b97cef1111b230371940e603a2ca401a4 /arch/s390/kernel/smp.c | |
parent | 7d7c7b24e416afb2637be8447e03ca4457c100fd (diff) |
s390/uaccess: always run the kernel in home space
Simplify the uaccess code by removing the user_mode=home option.
The kernel will now always run in the home space mode.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/smp.c')
-rw-r--r-- | arch/s390/kernel/smp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 1a4313a1b60f..cca6cf6abacc 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
@@ -283,7 +283,7 @@ static void pcpu_delegate(struct pcpu *pcpu, void (*func)(void *), | |||
283 | struct _lowcore *lc = lowcore_ptr[pcpu - pcpu_devices]; | 283 | struct _lowcore *lc = lowcore_ptr[pcpu - pcpu_devices]; |
284 | unsigned long source_cpu = stap(); | 284 | unsigned long source_cpu = stap(); |
285 | 285 | ||
286 | __load_psw_mask(psw_kernel_bits); | 286 | __load_psw_mask(PSW_KERNEL_BITS); |
287 | if (pcpu->address == source_cpu) | 287 | if (pcpu->address == source_cpu) |
288 | func(data); /* should not return */ | 288 | func(data); /* should not return */ |
289 | /* Stop target cpu (if func returns this stops the current cpu). */ | 289 | /* Stop target cpu (if func returns this stops the current cpu). */ |
@@ -395,7 +395,7 @@ void smp_send_stop(void) | |||
395 | int cpu; | 395 | int cpu; |
396 | 396 | ||
397 | /* Disable all interrupts/machine checks */ | 397 | /* Disable all interrupts/machine checks */ |
398 | __load_psw_mask(psw_kernel_bits | PSW_MASK_DAT); | 398 | __load_psw_mask(PSW_KERNEL_BITS | PSW_MASK_DAT); |
399 | trace_hardirqs_off(); | 399 | trace_hardirqs_off(); |
400 | 400 | ||
401 | debug_set_critical(); | 401 | debug_set_critical(); |
@@ -693,7 +693,7 @@ static void smp_start_secondary(void *cpuvoid) | |||
693 | S390_lowcore.restart_source = -1UL; | 693 | S390_lowcore.restart_source = -1UL; |
694 | restore_access_regs(S390_lowcore.access_regs_save_area); | 694 | restore_access_regs(S390_lowcore.access_regs_save_area); |
695 | __ctl_load(S390_lowcore.cregs_save_area, 0, 15); | 695 | __ctl_load(S390_lowcore.cregs_save_area, 0, 15); |
696 | __load_psw_mask(psw_kernel_bits | PSW_MASK_DAT); | 696 | __load_psw_mask(PSW_KERNEL_BITS | PSW_MASK_DAT); |
697 | cpu_init(); | 697 | cpu_init(); |
698 | preempt_disable(); | 698 | preempt_disable(); |
699 | init_cpu_timer(); | 699 | init_cpu_timer(); |