summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2016-07-26 14:15:11 +0200
committerDavid Vrabel <david.vrabel@citrix.com>2016-07-26 14:07:06 +0100
commitd34c30cc1fa80f509500ff192ea6bc7d30671061 (patch)
treee1efdb59cff6dbcc90f4a047d8f49f9561a1496f /arch
parentee42d665d3f5db975caf87baf101a57235ddb566 (diff)
downloadlinux-stable-d34c30cc1fa80f509500ff192ea6bc7d30671061.tar.gz
linux-stable-d34c30cc1fa80f509500ff192ea6bc7d30671061.tar.bz2
linux-stable-d34c30cc1fa80f509500ff192ea6bc7d30671061.zip
xen: add static initialization of steal_clock op to xen_time_ops
pv_time_ops might be overwritten with xen_time_ops after the steal_clock operation has been initialized already. To prevent calling a now uninitialized function pointer add the steal_clock static initialization to xen_time_ops. Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/xen/time.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index fd7cd6f29b68..67356d29d74d 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -364,6 +364,7 @@ void xen_timer_resume(void)
static const struct pv_time_ops xen_time_ops __initconst = {
.sched_clock = xen_clocksource_read,
+ .steal_clock = xen_steal_clock,
};
static void __init xen_time_init(void)