Merge changes from linux-2.6 by hand

[linux-2.6-omap-h63xx.git] / arch / powerpc / kernel / cputable.c

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 214f3b088edfcc62c0ce9709afb8192898629490..1fb80baebc8763379f8ee286211bfc8f5125de8e 100644 (file)
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -303,7 +303,7 @@ struct cpu_spec     cpu_specs[] = {
                .cpu_name               = "601",
                .cpu_features           = CPU_FTRS_PPC601,
                .cpu_user_features      = COMMON_USER | PPC_FEATURE_601_INSTR |
-                       PPC_FEATURE_UNIFIED_CACHE,
+                       PPC_FEATURE_UNIFIED_CACHE | PPC_FEATURE_NO_TB,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
        },
@@ -724,7 +724,8 @@ struct cpu_spec     cpu_specs[] = {
                .pvr_value              = 0x00201400,
                .cpu_name               = "403GCX",
                .cpu_features           = CPU_FTRS_40X,
-               .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,
        },