patch-2.4.22 linux-2.4.22/arch/mips/gt64120/momenco_ocelot/irq.c
Next file: linux-2.4.22/arch/mips/gt64120/momenco_ocelot/pci.c
Previous file: linux-2.4.22/arch/mips/gt64120/momenco_ocelot/int-handler.S
Back to the patch index
Back to the overall index
- Lines: 59
- Date:
2003-08-25 04:44:40.000000000 -0700
- Orig file:
linux-2.4.21/arch/mips/gt64120/momenco_ocelot/irq.c
- Orig date:
2002-08-02 17:39:43.000000000 -0700
diff -urN linux-2.4.21/arch/mips/gt64120/momenco_ocelot/irq.c linux-2.4.22/arch/mips/gt64120/momenco_ocelot/irq.c
@@ -28,6 +28,7 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
+#include <linux/config.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/kernel_stat.h>
@@ -60,18 +61,18 @@
/* do the low 8 bits first */
clr_mask = 0xff & clr_mask_in;
set_mask = 0xff & set_mask_in;
- status = read_32bit_cp0_register(CP0_STATUS);
+ status = read_c0_status();
status &= ~((clr_mask & 0xFF) << 8);
status |= (set_mask & 0xFF) << 8;
- write_32bit_cp0_register(CP0_STATUS, status);
+ write_c0_status(status);
/* do the high 8 bits */
clr_mask = 0xff & (clr_mask_in >> 8);
set_mask = 0xff & (set_mask_in >> 8);
- status = read_32bit_cp0_set1_register(CP0_S1_INTCONTROL);
+ status = read_c0_intcontrol();
status &= ~((clr_mask & 0xFF) << 8);
status |= (set_mask & 0xFF) << 8;
- write_32bit_cp0_set1_register(CP0_S1_INTCONTROL, status);
+ write_c0_intcontrol(status);
}
static inline void mask_irq(unsigned int irq)
@@ -135,7 +136,6 @@
extern asmlinkage void ocelot_handle_int(void);
-extern void gt64120_irq_init(void);
void __init init_IRQ(void)
{
@@ -144,7 +144,7 @@
/*
* Clear all of the interrupts while we change the able around a bit.
*/
- clear_cp0_status(ST0_IM);
+ clear_c0_status(ST0_IM);
__cli();
/* Sets the first-level interrupt dispatcher. */
@@ -158,9 +158,7 @@
irq_desc[i].handler = &cp7000_hpcdma_irq_type;
}
- gt64120_irq_init();
-
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
printk("start kgdb ...\n");
set_debug_traps();
breakpoint(); /* you may move this line to whereever you want :-) */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)