diff options
| author | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2017-05-03 22:20:51 +0200 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2017-05-05 10:43:15 +0200 |
| commit | d162809f85b4f54ef075517ffa2f3d02e55d5a53 (patch) | |
| tree | 3305107f1087882cb77f1db1c713cdfe24a44154 /arch/x86/xen/time.c | |
| parent | x86/xen: fix xsave capability setting (diff) | |
| download | linux-d162809f85b4f54ef075517ffa2f3d02e55d5a53.tar.xz linux-d162809f85b4f54ef075517ffa2f3d02e55d5a53.zip | |
xen/x86: Do not call xen_init_time_ops() until shared_info is initialized
Routines that are set by xen_init_time_ops() use shared_info's
pvclock_vcpu_time_info area. This area is not properly available until
shared_info is mapped in xen_setup_shared_info().
This became especially problematic due to commit dd759d93f4dd ("x86/timers:
Add simple udelay calibration") where we end up reading tsc_to_system_mul
from xen_dummy_shared_info (i.e. getting zero value) and then trying
to divide by it in pvclock_tsc_khz().
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch/x86/xen/time.c')
| -rw-r--r-- | arch/x86/xen/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 090c7eb4dca9..a1895a8e85c1 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -406,7 +406,7 @@ static void __init xen_time_init(void) pvclock_gtod_register_notifier(&xen_pvclock_gtod_notifier); } -void __init xen_init_time_ops(void) +void __ref xen_init_time_ops(void) { pv_time_ops = xen_time_ops; |