Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
  clocksource: make clocksource watchdog cycle through online CPUs
  Documentation: move timer related documentation to a single place
  clockevents: optimise tick_nohz_stop_sched_tick() a bit
  locking: remove unused double_spin_lock()
  hrtimers: simplify lockdep handling
  timers: simplify lockdep handling
  posix-timers: fix shadowed variables
  timer_list: add annotations to workqueue.c
  hrtimer: use nanosleep specific restart_block fields
  hrtimer: add nanosleep specific restart_block member

1 files changed, 15 insertions, 15 deletions

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index 2eae91f954ca..ae5c6c147c4b 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -1087,45 +1087,45 @@ static void check_process_timers(struct task_struct *tsk,
         maxfire = 20;
         prof_expires = cputime_zero;
         while (!list_empty(timers)) {
-                struct cpu_timer_list *t = list_first_entry(timers,
+                struct cpu_timer_list *tl = list_first_entry(timers,
                                                       struct cpu_timer_list,
                                                       entry);
-                if (!--maxfire || cputime_lt(ptime, t->expires.cpu)) {
-                        prof_expires = t->expires.cpu;
+                if (!--maxfire || cputime_lt(ptime, tl->expires.cpu)) {
+                        prof_expires = tl->expires.cpu;
                         break;
                 }
-                t->firing = 1;
-                list_move_tail(&t->entry, firing);
+                tl->firing = 1;
+                list_move_tail(&tl->entry, firing);
         }
 
         ++timers;
         maxfire = 20;
         virt_expires = cputime_zero;
         while (!list_empty(timers)) {
-                struct cpu_timer_list *t = list_first_entry(timers,
+                struct cpu_timer_list *tl = list_first_entry(timers,
                                                       struct cpu_timer_list,
                                                       entry);
-                if (!--maxfire || cputime_lt(utime, t->expires.cpu)) {
-                        virt_expires = t->expires.cpu;
+                if (!--maxfire || cputime_lt(utime, tl->expires.cpu)) {
+                        virt_expires = tl->expires.cpu;
                         break;
                 }
-                t->firing = 1;
-                list_move_tail(&t->entry, firing);
+                tl->firing = 1;
+                list_move_tail(&tl->entry, firing);
         }
 
         ++timers;
         maxfire = 20;
         sched_expires = 0;
         while (!list_empty(timers)) {
-                struct cpu_timer_list *t = list_first_entry(timers,
+                struct cpu_timer_list *tl = list_first_entry(timers,
                                                       struct cpu_timer_list,
                                                       entry);
-                if (!--maxfire || sum_sched_runtime < t->expires.sched) {
-                        sched_expires = t->expires.sched;
+                if (!--maxfire || sum_sched_runtime < tl->expires.sched) {
+                        sched_expires = tl->expires.sched;
                         break;
                 }
-                t->firing = 1;
-                list_move_tail(&t->entry, firing);
+                tl->firing = 1;
+                list_move_tail(&tl->entry, firing);
         }
 
         /*