[POWERPC] cpm: Describe multi-user ram in its own device node.

[linux-2.6-omap-h63xx.git] / arch / alpha / kernel / irq_alpha.c

diff --git a/arch/alpha/kernel/irq_alpha.c b/arch/alpha/kernel/irq_alpha.c
index 51d66b7f99e3a9b67975306593cd159ba682a014..e16aeb6e79ef8cd62955f27d7fd623cacfd79cca 100644 (file)
--- a/arch/alpha/kernel/irq_alpha.c
+++ b/arch/alpha/kernel/irq_alpha.c
@@ -6,6 +6,7 @@
 #include <linux/sched.h>
 #include <linux/irq.h>
 #include <linux/kernel_stat.h>
+#include <linux/module.h>
 
 #include <asm/machvec.h>
 #include <asm/dma.h>
@@ -16,6 +17,7 @@
 /* Hack minimum IPL during interrupt processing for broken hardware.  */
 #ifdef CONFIG_ALPHA_BROKEN_IRQ_MASK
 int __min_ipl;
+EXPORT_SYMBOL(__min_ipl);
 #endif
 
 /*
@@ -30,6 +32,7 @@ dummy_perf(unsigned long vector, struct pt_regs *regs)
 }
 
 void (*perf_irq)(unsigned long, struct pt_regs *) = dummy_perf;
+EXPORT_SYMBOL(perf_irq);
 
 /*
  * The main interrupt entry point.
@@ -72,7 +75,9 @@ do_entInt(unsigned long type, unsigned long vector,
                set_irq_regs(old_regs);
                return;
        case 2:
-               alpha_mv.machine_check(vector, la_ptr, regs);
+               old_regs = set_irq_regs(regs);
+               alpha_mv.machine_check(vector, la_ptr);
+               set_irq_regs(old_regs);
                return;
        case 3:
                old_regs = set_irq_regs(regs);
@@ -125,8 +130,7 @@ struct mcheck_info __mcheck_info;
 
 void
 process_mcheck_info(unsigned long vector, unsigned long la_ptr,
-                   struct pt_regs *regs, const char *machine,
-                   int expected)
+                   const char *machine, int expected)
 {
        struct el_common *mchk_header;
        const char *reason;
@@ -153,7 +157,7 @@ process_mcheck_info(unsigned long vector, unsigned long la_ptr,
        mchk_header = (struct el_common *)la_ptr;
 
        printk(KERN_CRIT "%s machine check: vector=0x%lx pc=0x%lx code=0x%x\n",
-              machine, vector, regs->pc, mchk_header->code);
+              machine, vector, get_irq_regs()->pc, mchk_header->code);
 
        switch (mchk_header->code) {
        /* Machine check reasons.  Defined according to PALcode sources.  */
@@ -194,7 +198,7 @@ process_mcheck_info(unsigned long vector, unsigned long la_ptr,
        printk(KERN_CRIT "machine check type: %s%s\n",
               reason, mchk_header->retry ? " (retryable)" : "");
 
-       dik_show_regs(regs, NULL);
+       dik_show_regs(get_irq_regs(), NULL);
 
 #ifdef CONFIG_VERBOSE_MCHECK
        if (alpha_verbose_mcheck > 1) {