2 files changed, 7 insertions, 0 deletions

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 1f5536c2fd02..7c5b05fa2194 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -373,6 +373,10 @@ static void __init setup_lowcore(void)
         mem_assign_absolute(S390_lowcore.restart_source, lc->restart_source);
         mem_assign_absolute(S390_lowcore.restart_psw, lc->restart_psw);
 
+#ifdef CONFIG_SMP
+        lc->spinlock_lockval = arch_spin_lockval(0);
+#endif
+
         set_prefix((u32)(unsigned long) lc);
         lowcore_ptr[0] = lc;
 }
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 86e65ec3422b..1f0b474041c4 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -170,6 +170,7 @@ static int pcpu_alloc_lowcore(struct pcpu *pcpu, int cpu)
         lc->panic_stack = pcpu->panic_stack + PAGE_SIZE
                 - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs);
         lc->cpu_nr = cpu;
+        lc->spinlock_lockval = arch_spin_lockval(cpu);
 #ifndef CONFIG_64BIT
         if (MACHINE_HAS_IEEE) {
                 lc->extended_save_area_addr = get_zeroed_page(GFP_KERNEL);
@@ -226,6 +227,7 @@ static void pcpu_prepare_secondary(struct pcpu *pcpu, int cpu)
         cpumask_set_cpu(cpu, mm_cpumask(&init_mm));
         atomic_inc(&init_mm.context.attach_count);
         lc->cpu_nr = cpu;
+        lc->spinlock_lockval = arch_spin_lockval(cpu);
         lc->percpu_offset = __per_cpu_offset[cpu];
         lc->kernel_asce = S390_lowcore.kernel_asce;
         lc->machine_flags = S390_lowcore.machine_flags;
@@ -809,6 +811,7 @@ void __init smp_cpus_done(unsigned int max_cpus)
 void __init smp_setup_processor_id(void)
 {
         S390_lowcore.cpu_nr = 0;
+        S390_lowcore.spinlock_lockval = arch_spin_lockval(0);
 }
 
 /*