git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...
[linux-2.6.git]
/
arch
/
x86_64
/
kernel
/
irq-xen.c
diff --git
a/arch/x86_64/kernel/irq-xen.c
b/arch/x86_64/kernel/irq-xen.c
index
a5b06c9
..
05ddad3
100644
(file)
--- a/
arch/x86_64/kernel/irq-xen.c
+++ b/
arch/x86_64/kernel/irq-xen.c
@@
-15,7
+15,6
@@
#include <linux/seq_file.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/seq_file.h>
#include <linux/module.h>
#include <linux/delay.h>
-#include <linux/vs_context.h>
#include <asm/uaccess.h>
#include <asm/io_apic.h>
#include <asm/idle.h>
#include <asm/uaccess.h>
#include <asm/io_apic.h>
#include <asm/idle.h>
@@
-118,7
+117,6
@@
asmlinkage unsigned int do_IRQ(struct pt_regs *regs)
{
/* high bit used in ret_from_ code */
unsigned irq = ~regs->orig_rax;
{
/* high bit used in ret_from_ code */
unsigned irq = ~regs->orig_rax;
- struct vx_info_save vxis;
if (unlikely(irq >= NR_IRQS)) {
printk(KERN_EMERG "%s: cannot handle IRQ %d\n",
if (unlikely(irq >= NR_IRQS)) {
printk(KERN_EMERG "%s: cannot handle IRQ %d\n",
@@
-132,9
+130,7
@@
asmlinkage unsigned int do_IRQ(struct pt_regs *regs)
#ifdef CONFIG_DEBUG_STACKOVERFLOW
stack_overflow_check(regs);
#endif
#ifdef CONFIG_DEBUG_STACKOVERFLOW
stack_overflow_check(regs);
#endif
- __enter_vx_admin(&vxis);
__do_IRQ(irq, regs);
__do_IRQ(irq, regs);
- __leave_vx_admin(&vxis);
irq_exit();
return 1;
irq_exit();
return 1;