summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorGerald Schaefer <gerald.schaefer@de.ibm.com>2014-01-28 17:40:12 (GMT)
committerJiri Slaby <jslaby@suse.cz>2014-03-12 08:43:42 (GMT)
commitb378f0653eb0674d94a0d6c526a663e57a3d7cac (patch)
tree7f3742b068a154061083830d99e5435f68e6caba /arch/s390
parentccb738e88b60ec21a96f8f5e11a1857236deb518 (diff)
downloadlinux-fsl-qoriq-b378f0653eb0674d94a0d6c526a663e57a3d7cac.tar.xz
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>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/appldata/appldata_base.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 87a2209..6c0281f 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;