diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-12-29 16:35:43 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-12-29 16:35:43 +0000 |
| commit | d0ed783f34132a6456fbee80ce5d121faf55fb8c (patch) | |
| tree | ed7bb65b9ba2d86bafa9ba4631718717cd944d01 /arch/mips/mips-boards/malta | |
| parent | 041d5780d54608a859ac6fd0fac06ec0e670aa5b (diff) | |
Bunch more patches from MIPS.
Diffstat (limited to 'arch/mips/mips-boards/malta')
| -rw-r--r-- | arch/mips/mips-boards/malta/malta_int.c | 6 | ||||
| -rw-r--r-- | arch/mips/mips-boards/malta/malta_setup.c | 23 |
2 files changed, 8 insertions, 21 deletions
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mips-boards/malta/malta_int.c index 8f90e6413..085fefcdb 100644 --- a/arch/mips/mips-boards/malta/malta_int.c +++ b/arch/mips/mips-boards/malta/malta_int.c @@ -154,7 +154,7 @@ int get_irq_list(char *buf) } -static int setup_irq(int irq, struct irqaction * new) +static int setup_irq(unsigned int irq, struct irqaction * new) { int shared = 0; struct irqaction *old, **p; @@ -316,7 +316,7 @@ void malta_hw0_irqdispatch(struct pt_regs *regs) if ( action == NULL ) return; - irq_enter(cpu); + irq_enter(cpu, irq); kstat.irqs[0][irq + 8]++; do { action->handler(irq, action->dev_id, regs); @@ -324,7 +324,7 @@ void malta_hw0_irqdispatch(struct pt_regs *regs) } while (action); enable_irq(irq); - irq_exit(cpu); + irq_exit(cpu, irq); } diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c index f653ceb9e..944c35e51 100644 --- a/arch/mips/mips-boards/malta/malta_setup.c +++ b/arch/mips/mips-boards/malta/malta_setup.c @@ -39,9 +39,6 @@ #include <asm/mips-boards/prom.h> #include <asm/mips-boards/malta.h> #include <asm/mips-boards/maltaint.h> -#ifdef CONFIG_BLK_DEV_IDE -#include <asm/ide.h> -#endif #ifdef CONFIG_BLK_DEV_FD #include <asm/floppy.h> #endif @@ -57,7 +54,6 @@ extern void set_debug_traps(void); extern void rs_kgdb_hook(int); extern void breakpoint(void); static int remote_debug = 0; -static int kgdb_on_pci = 0; #endif #ifdef CONFIG_BLK_DEV_IDE @@ -86,7 +82,7 @@ static void __init malta_irq_setup(void) maltaint_init(); #ifdef CONFIG_REMOTE_DEBUG - if (remote_debug && !kgdb_on_pci) { + if (remote_debug) { set_debug_traps(); breakpoint(); } @@ -106,7 +102,6 @@ void __init malta_setup(void) int i; irq_setup = malta_irq_setup; - mips_io_port_base = MALTA_PORT_BASE; /* Request I/O space for devices used on the Malta board. */ for (i = 0; i < STANDARD_IO_RESOURCES; i++) @@ -155,6 +150,10 @@ void __init malta_setup(void) /* Breakpoints and stuff are in malta_irq_setup() */ } #endif + + argptr = prom_getcmdline(); + if ((argptr = strstr(argptr, "nofpu")) != NULL) + mips_cpu.options &= ~MIPS_CPU_FPU; rtc_ops = &malta_rtc_ops; #ifdef CONFIG_BLK_DEV_IDE @@ -164,16 +163,4 @@ void __init malta_setup(void) fd_ops = &std_fd_ops; #endif mips_reboot_setup(); - - /* - * Setup the North bridge to do Master byte-lane swapping when - * running in bigendian. - * Be careful to use prom_printf after this. - */ -#if defined(__MIPSEL__) - GT_WRITE(GT_PCI0_CMD_OFS, GT_PCI0_CMD_MBYTESWAP_BIT | - GT_PCI0_CMD_SBYTESWAP_BIT); -#else - GT_WRITE(GT_PCI0_CMD_OFS, 0); -#endif } |