aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/smp.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/s390/kernel/smp.c')
-rw-r--r--arch/s390/kernel/smp.c6
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();