summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-25 16:52:25 +0100
committerDavid Vrabel <david.vrabel@citrix.com>2014-04-07 14:12:38 +0100
commitd06eb3ee9b09d753dc0883cc388d9a503839d6ca (patch)
tree9707d522ba8785dbed2a385b3f9c6883ba67b317
parent2c5cb2770392fb9c5d8518688c8bc61986d70dc6 (diff)
downloadblackbird-op-linux-d06eb3ee9b09d753dc0883cc388d9a503839d6ca.tar.gz
blackbird-op-linux-d06eb3ee9b09d753dc0883cc388d9a503839d6ca.zip
Xen: do hv callback accounting only on x86
Patch 99c8b79d3c1 "xen: Add proper irq accounting for HYPERCALL vector" added a call to inc_irq_stat(irq_hv_callback_count) in common Xen code, however both the inc_irq_stat function and the irq_hv_callback_count counter are architecture specific. This makes the code build again on ARM by moving the call into the existing #ifdef CONFIG_X86. We may want to later do the same implementation on ARM that x86 has though. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: David Vrabel <david.vrabel@citrix.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Xen <xen-devel@lists.xenproject.org>
-rw-r--r--drivers/xen/events/events_base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index d5a3de88ac59..dfa12a4a0a48 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -1248,8 +1248,8 @@ void xen_evtchn_do_upcall(struct pt_regs *regs)
irq_enter();
#ifdef CONFIG_X86
exit_idle();
-#endif
inc_irq_stat(irq_hv_callback_count);
+#endif
__xen_evtchn_do_upcall();
OpenPOWER on IntegriCloud