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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
mips
/
dec
/
setup.c
diff --git
a/arch/mips/dec/setup.c
b/arch/mips/dec/setup.c
index
7c1ca8f
..
d34032a
100644
(file)
--- a/
arch/mips/dec/setup.c
+++ b/
arch/mips/dec/setup.c
@@
-46,9
+46,7
@@
extern void dec_machine_restart(char *command);
extern void dec_machine_halt(void);
extern void dec_machine_power_off(void);
extern void dec_machine_restart(char *command);
extern void dec_machine_halt(void);
extern void dec_machine_power_off(void);
-extern irqreturn_t dec_intr_halt(int irq, void *dev_id, struct pt_regs *regs);
-
-extern asmlinkage void decstation_handle_int(void);
+extern irqreturn_t dec_intr_halt(int irq, void *dev_id);
unsigned long dec_kn_slot_base, dec_kn_slot_size;
unsigned long dec_kn_slot_base, dec_kn_slot_size;
@@
-107,7
+105,7
@@
static struct irqaction fpuirq = {
};
static struct irqaction busirq = {
};
static struct irqaction busirq = {
- .flags =
SA_INTERRUPT
,
+ .flags =
IRQF_DISABLED
,
.name = "bus error",
};
.name = "bus error",
};
@@
-126,7
+124,7
@@
static void __init dec_be_init(void)
case MACH_DS23100: /* DS2100/DS3100 Pmin/Pmax */
board_be_handler = dec_kn01_be_handler;
busirq.handler = dec_kn01_be_interrupt;
case MACH_DS23100: /* DS2100/DS3100 Pmin/Pmax */
board_be_handler = dec_kn01_be_handler;
busirq.handler = dec_kn01_be_interrupt;
- busirq.flags |=
SA_SHIRQ
;
+ busirq.flags |=
IRQF_SHARED
;
dec_kn01_be_init();
break;
case MACH_DS5000_1XX: /* DS5000/1xx 3min */
dec_kn01_be_init();
break;
case MACH_DS5000_1XX: /* DS5000/1xx 3min */
@@
-147,13
+145,11
@@
static void __init dec_be_init(void)
extern void dec_time_init(void);
extern void dec_time_init(void);
-extern void dec_timer_setup(struct irqaction *);
-void __init plat_setup(void)
+void __init plat_
mem_
setup(void)
{
board_be_init = dec_be_init;
board_time_init = dec_time_init;
{
board_be_init = dec_be_init;
board_time_init = dec_time_init;
- board_timer_setup = dec_timer_setup;
wbflush_setup();
wbflush_setup();
@@
-744,7
+740,6
@@
void __init arch_init_irq(void)
panic("Don't know how to set this up!");
break;
}
panic("Don't know how to set this up!");
break;
}
- set_except_vector(0, decstation_handle_int);
/* Free the FPU interrupt if the exception is present. */
if (!cpu_has_nofpuex) {
/* Free the FPU interrupt if the exception is present. */
if (!cpu_has_nofpuex) {
@@
-766,3
+761,9
@@
void __init arch_init_irq(void)
if (dec_interrupt[DEC_IRQ_HALT] >= 0)
setup_irq(dec_interrupt[DEC_IRQ_HALT], &haltirq);
}
if (dec_interrupt[DEC_IRQ_HALT] >= 0)
setup_irq(dec_interrupt[DEC_IRQ_HALT], &haltirq);
}
+
+asmlinkage unsigned int dec_irq_dispatch(unsigned int irq)
+{
+ do_IRQ(irq);
+ return 0;
+}