1 files changed, 6 insertions, 4 deletions

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 2da01340c84c..1eab54bc6ee9 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -1141,6 +1141,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc603",
         },
+#ifdef CONFIG_PPC_83xx
         {       /* e300c1 (a 603e core, plus some) on 83xx */
                 .pvr_mask               = 0x7fff0000,
                 .pvr_value              = 0x00830000,
@@ -1151,7 +1152,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .cpu_setup              = __setup_cpu_603,
-                .machine_check          = machine_check_generic,
+                .machine_check          = machine_check_83xx,
                 .platform               = "ppc603",
         },
         {       /* e300c2 (an e300c1 core, plus some, minus FPU) on 83xx */
@@ -1165,7 +1166,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .cpu_setup              = __setup_cpu_603,
-                .machine_check          = machine_check_generic,
+                .machine_check          = machine_check_83xx,
                 .platform               = "ppc603",
         },
         {       /* e300c3 (e300c1, plus one IU, half cache size) on 83xx */
@@ -1179,7 +1180,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .cpu_setup              = __setup_cpu_603,
-                .machine_check          = machine_check_generic,
+                .machine_check          = machine_check_83xx,
                 .num_pmcs               = 4,
                 .oprofile_cpu_type      = "ppc/e300",
                 .oprofile_type          = PPC_OPROFILE_FSL_EMB,
@@ -1196,12 +1197,13 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .cpu_setup              = __setup_cpu_603,
-                .machine_check          = machine_check_generic,
+                .machine_check          = machine_check_83xx,
                 .num_pmcs               = 4,
                 .oprofile_cpu_type      = "ppc/e300",
                 .oprofile_type          = PPC_OPROFILE_FSL_EMB,
                 .platform               = "ppc603",
         },
+#endif
         {       /* default match, we assume split I/D cache & TB (non-601)... */
                 .pvr_mask               = 0x00000000,
                 .pvr_value              = 0x00000000,