Merge Btrfs into fs/btrfs

[linux-2.6-omap-h63xx.git] / arch / mips / sgi-ip32 / crime.c

diff --git a/arch/mips/sgi-ip32/crime.c b/arch/mips/sgi-ip32/crime.c
index eb3a16a04fee2c75beec145a62d725f478cd3412..563c614ad021f37737fd82c77d98141655b79225 100644 (file)
--- a/arch/mips/sgi-ip32/crime.c
+++ b/arch/mips/sgi-ip32/crime.c
@@ -10,16 +10,18 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>
-#include <asm/ptrace.h>
 #include <asm/page.h>
 #include <asm/ip32/crime.h>
 #include <asm/ip32/mace.h>
 
-struct sgi_crime *crime;
-struct sgi_mace *mace;
+struct sgi_crime __iomem *crime;
+struct sgi_mace __iomem *mace;
+
+EXPORT_SYMBOL_GPL(mace);
 
 void __init crime_init(void)
 {
@@ -33,12 +35,11 @@ void __init crime_init(void)
        id = crime->id;
        rev = id & CRIME_ID_REV;
        id = (id & CRIME_ID_IDBITS) >> 4;
-       printk (KERN_INFO "CRIME id %1x rev %d at 0x%0*lx\n",
-               id, rev, field, (unsigned long) CRIME_BASE);
+       printk(KERN_INFO "CRIME id %1x rev %d at 0x%0*lx\n",
+              id, rev, field, (unsigned long) CRIME_BASE);
 }
 
-irqreturn_t
-crime_memerr_intr (unsigned int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t crime_memerr_intr(unsigned int irq, void *dev_id)
 {
        unsigned long stat, addr;
        int fatal = 0;
@@ -89,14 +90,13 @@ crime_memerr_intr (unsigned int irq, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
 
-irqreturn_t
-crime_cpuerr_intr (unsigned int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t crime_cpuerr_intr(unsigned int irq, void *dev_id)
 {
        unsigned long stat = crime->cpu_error_stat & CRIME_CPU_ERROR_MASK;
        unsigned long addr = crime->cpu_error_addr & CRIME_CPU_ERROR_ADDR_MASK;
 
        addr <<= 2;
-       printk ("CRIME CPU error at 0x%09lx status 0x%08lx\n", addr, stat);
+       printk("CRIME CPU error at 0x%09lx status 0x%08lx\n", addr, stat);
        crime->cpu_error_stat = 0;
 
        return IRQ_HANDLED;