Merge branch 'x86/urgent' into x86/cleanups

[linux-2.6-omap-h63xx.git] / arch / s390 / kernel / process.c

diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 85defd01d2937c36ccd0a92b18932969dfb8520f..3e2c05cb6a8733683c57d2935536ee936cc52059 100644 (file)
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -75,7 +75,9 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
        return sf->gprs[8];
 }
 
-DEFINE_PER_CPU(struct s390_idle_data, s390_idle);
+DEFINE_PER_CPU(struct s390_idle_data, s390_idle) = {
+       .lock = __SPIN_LOCK_UNLOCKED(s390_idle.lock)
+};
 
 static int s390_idle_enter(void)
 {
@@ -142,7 +144,7 @@ static void default_idle(void)
 void cpu_idle(void)
 {
        for (;;) {
-               tick_nohz_stop_sched_tick();
+               tick_nohz_stop_sched_tick(1);
                while (!need_resched())
                        default_idle();
                tick_nohz_restart_sched_tick();