From: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Date: Tue, 28 Jan 2014 17:40:12 +0000 (+0100)
Subject: s390/appldata: restore missing init_virt_timer()
X-Git-Tag: submit/tizen_common/20140905.094502~484
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b378f0653eb0674d94a0d6c526a663e57a3d7cac;p=sdk%2Femulator%2Femulator-kernel.git

s390/appldata: restore missing init_virt_timer()

commit b7c5b1aa2836c933ab03f90391619ebdc9112e46 upstream.

Commit 27f6b416 "s390/vtimer: rework virtual timer interface" removed
the call to init_virt_timer() by mistake, which is added again by this
patch.

Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---

diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 87a22092b68f..6c0281f30d44 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -527,6 +527,7 @@ static int __init appldata_init(void)
 {
 	int rc;
 
+	init_virt_timer(&appldata_timer);
 	appldata_timer.function = appldata_timer_function;
 	appldata_timer.data = (unsigned long) &appldata_work;