From 4c506bd37b289d2d8cfb846c9de0d86eaa8ff90a Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 16 Jan 2006 10:59:41 +0100
Subject: [PATCH] --- yaml --- r: 18703 b: refs/heads/master c:
 ea13dbc89caecd982500894d4238766a6bd3c8f4 h: refs/heads/master i:   18701:
 8f6315ca208c12125298f03cc38088407c3d63d5   18699:
 21967c439b39e80e0efd8622f788b14438529452   18695:
 061fda89f8a654918abda1b9baeb6d23be2beb75   18687:
 f6446abd0a6fc05d7ca01de4198e1b6e6f61aba7 v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/hrtimer.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 331ae32527f6..6ea22060a8ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d669af9d5afb5bdb629f78d024b35e507465f570
+refs/heads/master: ea13dbc89caecd982500894d4238766a6bd3c8f4
diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
index f5ca61422331..f1c4155b49ac 100644
--- a/trunk/kernel/hrtimer.c
+++ b/trunk/kernel/hrtimer.c
@@ -641,7 +641,8 @@ schedule_hrtimer_interruptible(struct hrtimer *timer,
 static long __sched
 nanosleep_restart(struct restart_block *restart, clockid_t clockid)
 {
-	struct timespec __user *rmtp, tu;
+	struct timespec __user *rmtp;
+	struct timespec tu;
 	void *rfn_save = restart->fn;
 	struct hrtimer timer;
 	ktime_t rem;