From 3dd9661ffeb706b9cadb85f2d5c7b1335a879fe8 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 23 Jan 2009 16:40:25 +0100
Subject: [PATCH] --- yaml --- r: 130086 b: refs/heads/master c:
 f9a2f797fcde5a4aa818bd3ca8584fd1197e9c15 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/s390/kernel/vtime.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e347a99d05b3..7e28938cf0a3 100644
--- 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
index 2fb36e462194..ecf0304e61c1 100644
--- 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));