Merge tag 'uuid-for-4.13-2' of git://git.infradead.org/users/hch/uuid

[linux.git] / arch / x86 / xen / time.c

diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index 090c7eb4dca9c43d5a52ff14e426a192349f7088..1ecb05db363203ec004f0e3c6764ca5f448fbc78 100644 (file)
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -309,7 +309,6 @@ static irqreturn_t xen_timer_interrupt(int irq, void *dev_id)
 void xen_teardown_timer(int cpu)
 {
        struct clock_event_device *evt;
-       BUG_ON(cpu == 0);
        evt = &per_cpu(xen_clock_events, cpu).evt;
 
        if (evt->irq >= 0) {
@@ -406,7 +405,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;