diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-31 00:25:51 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-31 00:25:51 (GMT) |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /arch/x86/xen/events.c | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
| download | linux-fsl-qoriq-bd45ac0c5daae35e7c71138172e63df5cf644cf6.tar.xz | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/x86/xen/events.c')
| -rw-r--r-- | arch/x86/xen/events.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/events.c b/arch/x86/xen/events.c index 6d1da58..dcf613e 100644 --- a/arch/x86/xen/events.c +++ b/arch/x86/xen/events.c @@ -465,7 +465,7 @@ void xen_send_IPI_one(unsigned int cpu, enum ipi_vector vector) * a bitset of words which contain pending event bits. The second * level is a bitset of pending events themselves. */ -fastcall void xen_evtchn_do_upcall(struct pt_regs *regs) +void xen_evtchn_do_upcall(struct pt_regs *regs) { int cpu = get_cpu(); struct shared_info *s = HYPERVISOR_shared_info; @@ -487,7 +487,7 @@ fastcall void xen_evtchn_do_upcall(struct pt_regs *regs) int irq = evtchn_to_irq[port]; if (irq != -1) { - regs->orig_eax = ~irq; + regs->orig_ax = ~irq; do_IRQ(regs); } } |