diff options
author | James.Yang <James.Yang@freescale.com> | 2007-05-02 17:34:43 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-17 07:10:15 -0400 |
commit | 3d372548b4af1a3d0a40f3dde7af5389a30ce359 (patch) | |
tree | 7533e8332e8a4d9be5d8770a455795f3ceed5695 | |
parent | f4dcd3c229a0745aff7d6835ca7c45aaeb293714 (diff) |
[POWERPC] Remove CPU_FTR_NEED_COHERENT for 7448.
Remove CPU_FTR_NEED_COHERENT for MPC7448 (and single-core MPC86xx).
This prevents needlessly setting M=1 when not SMP.
Signed-off-by: James.Yang <James.Yang@freescale.com>
Acked-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/kernel/cputable.c | 2 | ||||
-rw-r--r-- | include/asm-powerpc/cputable.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 9cb24d20f0f9..6ef87fb90b8e 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
@@ -836,7 +836,7 @@ static struct cpu_spec cpu_specs[] = { | |||
836 | .pvr_mask = 0xffff0000, | 836 | .pvr_mask = 0xffff0000, |
837 | .pvr_value = 0x80040000, | 837 | .pvr_value = 0x80040000, |
838 | .cpu_name = "7448", | 838 | .cpu_name = "7448", |
839 | .cpu_features = CPU_FTRS_7447A, | 839 | .cpu_features = CPU_FTRS_7448, |
840 | .cpu_user_features = COMMON_USER | | 840 | .cpu_user_features = COMMON_USER | |
841 | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, | 841 | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, |
842 | .icache_bsize = 32, | 842 | .icache_bsize = 32, |
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index 434524931ef3..82d595a52109 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h | |||
@@ -302,6 +302,12 @@ extern void do_feature_fixups(unsigned long value, void *fixup_start, | |||
302 | CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | \ | 302 | CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | \ |
303 | CPU_FTR_NAP_DISABLE_L2_PR | CPU_FTR_HAS_HIGH_BATS | \ | 303 | CPU_FTR_NAP_DISABLE_L2_PR | CPU_FTR_HAS_HIGH_BATS | \ |
304 | CPU_FTR_NEED_COHERENT | CPU_FTR_PPC_LE) | 304 | CPU_FTR_NEED_COHERENT | CPU_FTR_PPC_LE) |
305 | #define CPU_FTRS_7448 (CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \ | ||
306 | CPU_FTR_USE_TB | \ | ||
307 | CPU_FTR_MAYBE_CAN_NAP | CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | \ | ||
308 | CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | \ | ||
309 | CPU_FTR_NAP_DISABLE_L2_PR | CPU_FTR_HAS_HIGH_BATS | \ | ||
310 | CPU_FTR_PPC_LE) | ||
305 | #define CPU_FTRS_82XX (CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \ | 311 | #define CPU_FTRS_82XX (CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \ |
306 | CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB) | 312 | CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB) |
307 | #define CPU_FTRS_G2_LE (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE | \ | 313 | #define CPU_FTRS_G2_LE (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE | \ |