1 files changed, 7 insertions, 6 deletions

diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 66ca5757e368..78b64fe5e7c2 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -99,14 +99,15 @@ void default_idle(void)
 {
         int cpu, rc;
 
+        /* CPU is going idle. */
+        cpu = smp_processor_id();
+
         local_irq_disable();
-        if (need_resched()) {
+        if (need_resched()) {
                 local_irq_enable();
-                return;
-        }
+                return;
+        }
 
-        /* CPU is going idle. */
-        cpu = smp_processor_id();
         rc = notifier_call_chain(&idle_chain, CPU_IDLE, (void *)(long) cpu);
         if (rc != NOTIFY_OK && rc != NOTIFY_DONE)
                 BUG();
@@ -119,7 +120,7 @@ void default_idle(void)
         __ctl_set_bit(8, 15);
 
 #ifdef CONFIG_HOTPLUG_CPU
-        if (cpu_is_offline(smp_processor_id()))
+        if (cpu_is_offline(cpu))
                 cpu_die();
 #endif