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
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
mips
/
gt64120
/
ev64120
/
irq.c
diff --git
a/arch/mips/gt64120/ev64120/irq.c
b/arch/mips/gt64120/ev64120/irq.c
index
537eab3
..
3b18615
100644
(file)
--- a/
arch/mips/gt64120/ev64120/irq.c
+++ b/
arch/mips/gt64120/ev64120/irq.c
@@
-39,7
+39,7
@@
#include <linux/timex.h>
#include <linux/slab.h>
#include <linux/random.h>
#include <linux/timex.h>
#include <linux/slab.h>
#include <linux/random.h>
-#include <
asm
/bitops.h>
+#include <
linux
/bitops.h>
#include <asm/bootinfo.h>
#include <asm/io.h>
#include <asm/mipsregs.h>
#include <asm/bootinfo.h>
#include <asm/io.h>
#include <asm/mipsregs.h>
@@
-119,7
+119,7
@@
void gt64120_irq_setup(void)
/* Sets the exception_handler array. */
set_except_vector(0, galileo_handle_int);
/* Sets the exception_handler array. */
set_except_vector(0, galileo_handle_int);
-
cli
();
+
local_irq_disable
();
/*
* Enable timer. Other interrupts will be enabled as they are
/*
* Enable timer. Other interrupts will be enabled as they are
@@
-128,7
+128,7
@@
void gt64120_irq_setup(void)
set_c0_status(IE_IRQ2);
}
set_c0_status(IE_IRQ2);
}
-void __init
init_IRQ
(void)
+void __init
arch_init_irq
(void)
{
int i;
{
int i;
@@
-138,7
+138,7
@@
void __init init_IRQ(void)
irq_desc[i].handler = &no_irq_type;
irq_desc[i].action = NULL;
irq_desc[i].depth = 0;
irq_desc[i].handler = &no_irq_type;
irq_desc[i].action = NULL;
irq_desc[i].depth = 0;
-
irq_desc[i].lock = SPIN_LOCK_UNLOCKED
;
+
spin_lock_init(&irq_desc[i].lock)
;
}
gt64120_irq_setup();
}
gt64120_irq_setup();