diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-23 11:22:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-23 11:22:45 -0700 |
| commit | a56e88ec05df50110f2bf578b6e17128f37111ed (patch) | |
| tree | fe3ee0bcd1cef2d28ffd62a0c012ad972c581049 /arch/x86/xen/time.c | |
| parent | 4b162c530d9c101381500e586fedb1340595a6ff (diff) | |
| parent | 96edd61dcf44362d3ef0bed1a5361e0ac7886a63 (diff) | |
| download | linux-a56e88ec05df50110f2bf578b6e17128f37111ed.tar.bz2 | |
Merge tag 'for-linus-4.13b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"Some fixes and cleanups for running under Xen"
* tag 'for-linus-4.13b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/balloon: don't online new memory initially
xen/x86: fix cpu hotplug
xen/grant-table: log the lack of grants
xen/x86: Don't BUG on CPU0 offlining
Diffstat (limited to 'arch/x86/xen/time.c')
| -rw-r--r-- | arch/x86/xen/time.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index a1895a8e85c1..1ecb05db3632 100644 --- 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) { |