diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 20:50:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 20:50:18 -0400 |
| commit | c8d9762affa0a97e299be2cabfec861515ef1580 (patch) | |
| tree | 50fdc530c553c6f19983786fc1fd27d9fdd1ba7b /drivers/xen | |
| parent | 26c12d93348f0bda0756aff83f4867d9ae58a5a6 (diff) | |
| parent | d06eb3ee9b09d753dc0883cc388d9a503839d6ca (diff) | |
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
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/events/events_base.c | 2 |
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) | |||
| 1248 | irq_enter(); | 1248 | irq_enter(); |
| 1249 | #ifdef CONFIG_X86 | 1249 | #ifdef CONFIG_X86 |
| 1250 | exit_idle(); | 1250 | exit_idle(); |
| 1251 | #endif | ||
| 1252 | inc_irq_stat(irq_hv_callback_count); | 1251 | inc_irq_stat(irq_hv_callback_count); |
| 1252 | #endif | ||
| 1253 | 1253 | ||
| 1254 | __xen_evtchn_do_upcall(); | 1254 | __xen_evtchn_do_upcall(); |
| 1255 | 1255 | ||