diff options
| -rw-r--r-- | arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/cputable.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S index 0b9af01..d8c7baf 100644 --- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S +++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S @@ -53,6 +53,7 @@ _GLOBAL(__e500_dcache_setup) isync blr +#ifdef CONFIG_PPC_BOOK3E_64 _GLOBAL(__setup_cpu_e6500) mflr r6 #ifdef CONFIG_PPC64 @@ -61,6 +62,7 @@ _GLOBAL(__setup_cpu_e6500) bl __setup_cpu_e5500 mtlr r6 blr +#endif #ifdef CONFIG_PPC32 _GLOBAL(__setup_cpu_e200) diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index ae9f433..290e68f 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c @@ -2062,6 +2062,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .machine_check = machine_check_e500mc, .platform = "ppce5500", }, +#ifndef CONFIG_PPC32 { /* e6500 */ .pvr_mask = 0xffff0000, .pvr_value = 0x80400000, @@ -2077,12 +2078,11 @@ static struct cpu_spec __initdata cpu_specs[] = { .oprofile_cpu_type = "ppc/e6500", .oprofile_type = PPC_OPROFILE_FSL_EMB, .cpu_setup = __setup_cpu_e6500, -#ifndef CONFIG_PPC32 .cpu_restore = __restore_cpu_e6500, -#endif .machine_check = machine_check_e500mc, .platform = "ppce6500", }, +#endif #ifdef CONFIG_PPC32 { /* default match */ .pvr_mask = 0x00000000, |