[MIPS] IP32: Enable PCI bridges
[linux-2.6.git] / arch / mips / oprofile / op_model_rm9000.c
index bee47793cb1af0201adc14e33c6b2799220dde70..d29040a56aeaf39573c312389a7c98e77e7cce1b 100644 (file)
@@ -5,6 +5,7 @@
  *
  * Copyright (C) 2004 by Ralf Baechle
  */
+#include <linux/init.h>
 #include <linux/oprofile.h>
 #include <linux/interrupt.h>
 #include <linux/smp.h>
@@ -79,10 +80,10 @@ static void rm9000_cpu_stop(void *args)
        write_c0_perfcontrol(0);
 }
 
-static irqreturn_t rm9000_perfcount_handler(int irq, void * dev_id,
-       struct pt_regs *regs)
+static irqreturn_t rm9000_perfcount_handler(int irq, void * dev_id)
 {
        unsigned int control = read_c0_perfcontrol();
+       struct pt_regs *regs = get_irq_regs();
        uint32_t counter1, counter2;
        uint64_t counters;
 
@@ -114,7 +115,7 @@ static irqreturn_t rm9000_perfcount_handler(int irq, void * dev_id,
        return IRQ_HANDLED;
 }
 
-static int rm9000_init(void)
+static int __init rm9000_init(void)
 {
        return request_irq(rm9000_perfcount_irq, rm9000_perfcount_handler,
                           0, "Perfcounter", NULL);
@@ -125,7 +126,7 @@ static void rm9000_exit(void)
        free_irq(rm9000_perfcount_irq, NULL);
 }
 
-struct op_mips_model op_model_rm9000 = {
+struct op_mips_model op_model_rm9000_ops = {
        .reg_setup      = rm9000_reg_setup,
        .cpu_setup      = rm9000_cpu_setup,
        .init           = rm9000_init,