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 patched with stable patch-2.6.18.5-vs2.0...
[linux-2.6.git]
/
arch
/
cris
/
kernel
/
irq.c
diff --git
a/arch/cris/kernel/irq.c
b/arch/cris/kernel/irq.c
index
e43acdf
..
903ea62
100644
(file)
--- a/
arch/cris/kernel/irq.c
+++ b/
arch/cris/kernel/irq.c
@@
-92,7
+92,6
@@
skip:
asmlinkage void do_IRQ(int irq, struct pt_regs * regs)
{
unsigned long sp;
asmlinkage void do_IRQ(int irq, struct pt_regs * regs)
{
unsigned long sp;
-
irq_enter();
sp = rdsp();
if (unlikely((sp & (PAGE_SIZE - 1)) < (PAGE_SIZE/8))) {
irq_enter();
sp = rdsp();
if (unlikely((sp & (PAGE_SIZE - 1)) < (PAGE_SIZE/8))) {