diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 15:48:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 15:48:03 -0700 |
commit | 899ad580fe93c6d2a9f364fb0329ef2c259ccd1d (patch) | |
tree | 29727a0a8543b45b58e44cdd111f7890d6cec0a9 /arch/ia64/include/asm/xen/events.h | |
parent | a425a638c858fd10370b573bde81df3ba500e271 (diff) | |
parent | 0692698cb7369ea1ce74f3f87f70baf5072f8a37 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] xen_domu_defconfig: fix build issues/warnings
Diffstat (limited to 'arch/ia64/include/asm/xen/events.h')
-rw-r--r-- | arch/ia64/include/asm/xen/events.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/ia64/include/asm/xen/events.h b/arch/ia64/include/asm/xen/events.h index 73248781fba..b8370c8b619 100644 --- a/arch/ia64/include/asm/xen/events.h +++ b/arch/ia64/include/asm/xen/events.h @@ -36,14 +36,9 @@ static inline int xen_irqs_disabled(struct pt_regs *regs) return !(ia64_psr(regs)->i); } -static inline void xen_do_IRQ(int irq, struct pt_regs *regs) +static inline void handle_irq(int irq, struct pt_regs *regs) { - struct pt_regs *old_regs; - old_regs = set_irq_regs(regs); - irq_enter(); __do_IRQ(irq); - irq_exit(); - set_irq_regs(old_regs); } #define irq_ctx_init(cpu) do { } while (0) |