---

yaml --- r: 234626 b: refs/heads/master c: 5cd10e7 h: refs/heads/master v: v3
git-mirror · Mar 2, 2011 · f2df765 · f2df765
1 parent 563ac31
commit f2df765
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fdd7f89006dd5a4c702fa0ce0c272345fa44ae0
+refs/heads/master: 5cd10e7946d28cfc42442fee2e6c757e244d756e
diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
@@ -635,6 +635,8 @@ static void retrigger_next_event(void *arg)
 	raw_spin_lock(&base->lock);
 	base->clock_base[HRTIMER_BASE_REALTIME].offset =
 		timespec_to_ktime(realtime_offset);
+	base->clock_base[HRTIMER_BASE_BOOTTIME].offset =
+		timespec_to_ktime(sleep);
 
 	hrtimer_force_reprogram(base, 0);
 	raw_spin_unlock(&base->lock);