summaryrefslogtreecommitdiff
path: root/drivers/xen
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-11 20:01:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-11 20:01:04 -0700
commit16ad56972ca3161eb97583897f17c1ead0c4ebd0 (patch)
tree72b803705fcaea6fb318b7b03698681d23340494 /drivers/xen
parenta6360dd37e1a144ed11e6548371bade559a1e4df (diff)
parent947ccf9c3c30307b774af3666ee74fcd9f47f646 (diff)
Merge branch 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: Allow PV-OPS kernel to detect whether XSAVE is supported xen: just completely disable XSAVE xen/debug: Don't be so verbose with WARN on 1-1 mapping errors. xen: events: fix error checks in bind_*_to_irqhandler()
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/events.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 42d6c930cc8..33167b43ac7 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -912,8 +912,7 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
unsigned long irqflags,
const char *devname, void *dev_id)
{
- unsigned int irq;
- int retval;
+ int irq, retval;
irq = bind_evtchn_to_irq(evtchn);
if (irq < 0)
@@ -955,8 +954,7 @@ int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
irq_handler_t handler,
unsigned long irqflags, const char *devname, void *dev_id)
{
- unsigned int irq;
- int retval;
+ int irq, retval;
irq = bind_virq_to_irq(virq, cpu);
if (irq < 0)