diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-22 16:51:34 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-22 16:51:34 +1000 |
| commit | 985990137e81ca9fd6561cd0f7d1a9695ec57d5a (patch) | |
| tree | 7a67493285623a7356ba7065cada6728993d1a3b /arch/powerpc/kernel | |
| parent | 834289447542b7ec55c0847486616d4d53ddf891 (diff) | |
| parent | 63172cb3d5ef762dcb60a292bc7f016b85cf6e1f (diff) | |
| download | blackbird-op-linux-985990137e81ca9fd6561cd0f7d1a9695ec57d5a.tar.gz blackbird-op-linux-985990137e81ca9fd6561cd0f7d1a9695ec57d5a.zip | |
Merge changes from linux-2.6 by hand
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/cputable.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 214f3b088edf..1fb80baebc87 100644 --- 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, }, |
