1 files changed, 10 insertions, 12 deletions

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 98bee013f71f..c642ef75069f 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1354,13 +1354,13 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
         struct hrtimer_sleeper t;
         struct timespec __user  *rmtp;
 
-        hrtimer_init(&t.timer, restart->arg0, HRTIMER_MODE_ABS);
-        t.timer.expires.tv64 = ((u64)restart->arg3 << 32) | (u64) restart->arg2;
+        hrtimer_init(&t.timer, restart->nanosleep.index, HRTIMER_MODE_ABS);
+        t.timer.expires.tv64 = restart->nanosleep.expires;
 
         if (do_nanosleep(&t, HRTIMER_MODE_ABS))
                 return 0;
 
-        rmtp = (struct timespec __user *)restart->arg1;
+        rmtp = restart->nanosleep.rmtp;
         if (rmtp) {
                 int ret = update_rmtp(&t.timer, rmtp);
                 if (ret <= 0)
@@ -1394,10 +1394,9 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
 
         restart = &current_thread_info()->restart_block;
         restart->fn = hrtimer_nanosleep_restart;
-        restart->arg0 = (unsigned long) t.timer.base->index;
-        restart->arg1 = (unsigned long) rmtp;
-        restart->arg2 = t.timer.expires.tv64 & 0xFFFFFFFF;
-        restart->arg3 = t.timer.expires.tv64 >> 32;
+        restart->nanosleep.index = t.timer.base->index;
+        restart->nanosleep.rmtp = rmtp;
+        restart->nanosleep.expires = t.timer.expires.tv64;
 
         return -ERESTART_RESTARTBLOCK;
 }
@@ -1425,7 +1424,6 @@ static void __cpuinit init_hrtimers_cpu(int cpu)
         int i;
 
         spin_lock_init(&cpu_base->lock);
-        lockdep_set_class(&cpu_base->lock, &cpu_base->lock_key);
 
         for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++)
                 cpu_base->clock_base[i].cpu_base = cpu_base;
@@ -1466,16 +1464,16 @@ static void migrate_hrtimers(int cpu)
         tick_cancel_sched_timer(cpu);
 
         local_irq_disable();
-        double_spin_lock(&new_base->lock, &old_base->lock,
-                         smp_processor_id() < cpu);
+        spin_lock(&new_base->lock);
+        spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING);
 
         for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {
                 migrate_hrtimer_list(&old_base->clock_base[i],
                                      &new_base->clock_base[i]);
         }
 
-        double_spin_unlock(&new_base->lock, &old_base->lock,
-                           smp_processor_id() < cpu);
+        spin_unlock(&old_base->lock);
+        spin_unlock(&new_base->lock);
         local_irq_enable();
         put_cpu_var(hrtimer_bases);
 }