---

yaml --- r: 130086 b: refs/heads/master c: f9a2f79 h: refs/heads/master v: v3
git-mirror · Jan 23, 2009 · 3dd9661 · 3dd9661
1 parent 3417d1b
commit 3dd9661
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9a4e9d563ea643d305b5fe83031d7deca311db3
+refs/heads/master: f9a2f797fcde5a4aa818bd3ca8584fd1197e9c15
diff --git a/trunk/arch/s390/kernel/vtime.c b/trunk/arch/s390/kernel/vtime.c
@@ -516,8 +516,12 @@ EXPORT_SYMBOL(del_virt_timer);
  */
 void init_cpu_vtimer(void)
 {
+	struct thread_info *ti = current_thread_info();
 	struct vtimer_queue *vq;
 
+	S390_lowcore.user_timer = ti->user_timer;
+	S390_lowcore.system_timer = ti->system_timer;
+
 	/* kick the virtual timer */
 	asm volatile ("STCK %0" : "=m" (S390_lowcore.last_update_clock));
 	asm volatile ("STPT %0" : "=m" (S390_lowcore.last_update_timer));