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
/
arm26
/
kernel
/
irq.c
diff --git
a/arch/arm26/kernel/irq.c
b/arch/arm26/kernel/irq.c
index
6f5272e
..
d87d68b
100644
(file)
--- a/
arch/arm26/kernel/irq.c
+++ b/
arch/arm26/kernel/irq.c
@@
-31,7
+31,6
@@
#include <linux/init.h>
#include <linux/seq_file.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/seq_file.h>
#include <linux/errno.h>
-#include <linux/vs_context.h>
#include <asm/irq.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/system.h>
@@
-332,7
+331,6
@@
do_level_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
asmlinkage void asm_do_IRQ(int irq, struct pt_regs *regs)
{
struct irqdesc *desc = irq_desc + irq;
asmlinkage void asm_do_IRQ(int irq, struct pt_regs *regs)
{
struct irqdesc *desc = irq_desc + irq;
- struct vx_info_save vxis;
/*
* Some hardware gives randomly wrong interrupts. Rather
/*
* Some hardware gives randomly wrong interrupts. Rather
@@
-343,9
+341,7
@@
asmlinkage void asm_do_IRQ(int irq, struct pt_regs *regs)
irq_enter();
spin_lock(&irq_controller_lock);
irq_enter();
spin_lock(&irq_controller_lock);
- __enter_vx_admin(&vxis);
desc->handle(irq, desc, regs);
desc->handle(irq, desc, regs);
- __leave_vx_admin(&vxis);
spin_unlock(&irq_controller_lock);
irq_exit();
}
spin_unlock(&irq_controller_lock);
irq_exit();
}