summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen/time.c
diff options
context:
space:
mode:
authorBoris Ostrovsky <boris.ostrovsky@oracle.com>2014-12-22 19:33:10 +0100
committerDavid Vrabel <david.vrabel@citrix.com>2014-12-23 11:31:55 +0100
commit8b8cd8a3673dd766428aee8222fa8fd3fdd26d58 (patch)
treef218d559b21e9e0e4fa7c5ffcc49c0be48e30dc6 /arch/x86/xen/time.c
parentMerge branch 'devel/for-linus-3.19' into stable/for-linus-3.19 (diff)
downloadlinux-8b8cd8a3673dd766428aee8222fa8fd3fdd26d58.tar.xz
linux-8b8cd8a3673dd766428aee8222fa8fd3fdd26d58.zip
x86/xen: Remove unnecessary BUG_ON(preemptible()) in xen_setup_timer()
There is no reason for having it and, with commit 250a1ac685f1 ("x86, smpboot: Remove pointless preempt_disable() in native_smp_prepare_cpus()"), it prevents HVM guests from booting. Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'arch/x86/xen/time.c')
-rw-r--r--arch/x86/xen/time.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index f473d268d387..23019b483908 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -458,8 +458,6 @@ void xen_setup_timer(int cpu)
void xen_setup_cpu_clockevents(void)
{
- BUG_ON(preemptible());
-
clockevents_register_device(this_cpu_ptr(&xen_clock_events.evt));
}