commit c8d9762affa0a97e299be2cabfec861515ef1580
author Linus Torvalds <torvalds@linux-foundation.org> Mon Apr 07 17:50:18 2014 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Apr 07 17:50:18 2014 -0700
tree 50fdc530c553c6f19983786fc1fd27d9fdd1ba7b
parent 26c12d93348f0bda0756aff83f4867d9ae58a5a6
parent d06eb3ee9b09d753dc0883cc388d9a503839d6ca

Merge tag 'stable/for-linus-3.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull Xen build fix from David Vrabel:
 "Fix arm build of drivers/xen/events/

  The merge of irq-core-for-linus branch broke it"

* tag 'stable/for-linus-3.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  Xen: do hv callback accounting only on x86

drivers/xen/events/events_base.c

diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index d5a3de8..dfa12a4 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -1248,8 +1248,8 @@
 	irq_enter();
 #ifdef CONFIG_X86
 	exit_idle();
-#endif
 	inc_irq_stat(irq_hv_callback_count);
+#endif
 
 	__xen_evtchn_do_upcall();