powerpc/mce: Move 64-bit machine check code into mce.c

We already have mce.c which is built for 64bit and contains other parts
of the machine check code, so move these bits in there too.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/kernel/mce.c b/arch/powerpc/kernel/mce.c
index e0e131e..9b2ea7e 100644 (file)
--- a/arch/powerpc/kernel/mce.c
+++ b/arch/powerpc/kernel/mce.c
@@ -22,11 +22,14 @@
 #undef DEBUG
 #define pr_fmt(fmt) "mce: " fmt
 
+#include <linux/hardirq.h>
 #include <linux/types.h>
 #include <linux/ptrace.h>
 #include <linux/percpu.h>
 #include <linux/export.h>
 #include <linux/irq_work.h>
+
+#include <asm/machdep.h>
 #include <asm/mce.h>
 
 static DEFINE_PER_CPU(int, mce_nest_count);
@@ -446,3 +449,33 @@ uint64_t get_mce_fault_addr(struct machine_check_event *evt)
        return 0;
 }
 EXPORT_SYMBOL(get_mce_fault_addr);
+
+/*
+ * This function is called in real mode. Strictly no printk's please.
+ *
+ * regs->nip and regs->msr contains srr0 and ssr1.
+ */
+long machine_check_early(struct pt_regs *regs)
+{
+       long handled = 0;
+
+       __this_cpu_inc(irq_stat.mce_exceptions);
+
+       if (cur_cpu_spec && cur_cpu_spec->machine_check_early)
+               handled = cur_cpu_spec->machine_check_early(regs);
+       return handled;
+}
+
+long hmi_exception_realmode(struct pt_regs *regs)
+{
+       __this_cpu_inc(irq_stat.hmi_exceptions);
+
+       wait_for_subcore_guest_exit();
+
+       if (ppc_md.hmi_exception_early)
+               ppc_md.hmi_exception_early(regs);
+
+       wait_for_tb_resync();
+
+       return 0;
+}

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index ef957c2..a891c27 100644 (file)
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -314,39 +314,6 @@ out:
        /* What should we do here? We could issue a shutdown or hard reset. */
 }
 
-#ifdef CONFIG_PPC64
-/*
- * This function is called in real mode. Strictly no printk's please.
- *
- * regs->nip and regs->msr contains srr0 and ssr1.
- */
-long machine_check_early(struct pt_regs *regs)
-{
-       long handled = 0;
-
-       __this_cpu_inc(irq_stat.mce_exceptions);
-
-       if (cur_cpu_spec && cur_cpu_spec->machine_check_early)
-               handled = cur_cpu_spec->machine_check_early(regs);
-       return handled;
-}
-
-long hmi_exception_realmode(struct pt_regs *regs)
-{
-       __this_cpu_inc(irq_stat.hmi_exceptions);
-
-       wait_for_subcore_guest_exit();
-
-       if (ppc_md.hmi_exception_early)
-               ppc_md.hmi_exception_early(regs);
-
-       wait_for_tb_resync();
-
-       return 0;
-}
-
-#endif
-
 /*
  * I/O accesses can cause machine checks on powermacs.
  * Check if the NIP corresponds to the address of a sync