From 04eb0d8358434ca6efb364707224ccccc1046e38 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 12 Oct 2005 14:22:50 +1000 Subject: [PATCH] --- yaml --- r: 9819 b: refs/heads/master c: d8e998c58a870770905495a1d45ebf7285b5b1c5 h: refs/heads/master i: 9817: 60cf4e42b3b3b3c5f58e841a20797925068fd3db 9815: da1f301f64ea8c8c455ff2e7af5d83f159744639 v: v3 --- [refs] | 2 +- trunk/arch/ppc/kernel/cputable.c | 5 +++-- trunk/include/asm-ppc/cputable.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0bde9955398c..cc220acff1fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbd27b8ced4b1888c93f69b4dd108a69ac4d733f +refs/heads/master: d8e998c58a870770905495a1d45ebf7285b5b1c5 diff --git a/trunk/arch/ppc/kernel/cputable.c b/trunk/arch/ppc/kernel/cputable.c index 546e1ea4cafa..6b76cf58d9e0 100644 --- a/trunk/arch/ppc/kernel/cputable.c +++ b/trunk/arch/ppc/kernel/cputable.c @@ -91,7 +91,7 @@ struct cpu_spec cpu_specs[] = { .cpu_features = CPU_FTR_COMMON | CPU_FTR_601 | CPU_FTR_HPTE_TABLE, .cpu_user_features = COMMON_PPC | PPC_FEATURE_601_INSTR | - PPC_FEATURE_UNIFIED_CACHE, + PPC_FEATURE_UNIFIED_CACHE | PPC_FEATURE_NO_TB, .icache_bsize = 32, .dcache_bsize = 32, .cpu_setup = __setup_cpu_601 @@ -745,7 +745,8 @@ struct cpu_spec cpu_specs[] = { .cpu_name = "403GCX", .cpu_features = CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB, - .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, + .cpu_user_features = PPC_FEATURE_32 | + PPC_FEATURE_HAS_MMU | PPC_FEATURE_NO_TB, .icache_bsize = 16, .dcache_bsize = 16, }, diff --git a/trunk/include/asm-ppc/cputable.h b/trunk/include/asm-ppc/cputable.h index 41d8f8425c04..e17c492c870b 100644 --- a/trunk/include/asm-ppc/cputable.h +++ b/trunk/include/asm-ppc/cputable.h @@ -24,6 +24,7 @@ #define PPC_FEATURE_HAS_SPE 0x00800000 #define PPC_FEATURE_HAS_EFP_SINGLE 0x00400000 #define PPC_FEATURE_HAS_EFP_DOUBLE 0x00200000 +#define PPC_FEATURE_NO_TB 0x00100000 #ifdef __KERNEL__