summaryrefslogtreecommitdiff
path: root/drivers/xen/events
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-05 21:29:40 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-05 21:29:40 +0300
commit383378d115ab6e702d77896071d36056875602db (patch)
tree1dce033018c7b3946a9ed249f851752e265ed010 /drivers/xen/events
parent9e3596b0c6539e28546ff7c72a06576627068353 (diff)
parent0b47a6bd1150f4846b1d61925a4cc5a96593a541 (diff)
downloadlinux-383378d115ab6e702d77896071d36056875602db.tar.xz
Merge tag 'for-linus-4.10-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes and cleanups from Juergen Gross: - small fixes for xenbus driver - one fix for xen dom0 boot on huge system - small cleanups * tag 'for-linus-4.10-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: Xen: ARM: Zero reserved fields of xatp before making hypervisor call xen: events: Replace BUG() with BUG_ON() xen: remove stale xs_input_avail() from header xen: return xenstore command failures via response instead of rc xen: xenbus driver must not accept invalid transaction ids xen/evtchn: use rb_entry() xen/setup: Don't relocate p2m over existing one
Diffstat (limited to 'drivers/xen/events')
-rw-r--r--drivers/xen/events/events_fifo.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/xen/events/events_fifo.c b/drivers/xen/events/events_fifo.c
index c03f9c86c7e3..3c41470c7fc4 100644
--- a/drivers/xen/events/events_fifo.c
+++ b/drivers/xen/events/events_fifo.c
@@ -369,8 +369,7 @@ static void evtchn_fifo_resume(void)
}
ret = init_control_block(cpu, control_block);
- if (ret < 0)
- BUG();
+ BUG_ON(ret < 0);
}
/*