Commit c8d9762a authored Apr 07, 2014 by Linus Torvalds

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

parents 26c12d93 d06eb3ee

drivers/xen/events/events_base.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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();