diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2006-11-22 18:46:46 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 04:40:34 -0500 |
commit | 0b8e2e131094d162a836e2afe86e52acbfa05703 (patch) | |
tree | c7000c2b7840c0445df815e89a176e94ca082a6e /include/asm-powerpc | |
parent | e0426047cb684842700f0098f74842a38260dbae (diff) |
[POWERPC] Make 64-bit cpu features defined on 32-bit
It saves #ifdef'ing in callers if we at least define the 64-bit cpu
features for 32-bit also.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r-- | include/asm-powerpc/cputable.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index d06222a5be5e..354f66da9dcf 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h | |||
@@ -315,7 +315,8 @@ extern void do_feature_fixups(unsigned long value, void *fixup_start, | |||
315 | #define CPU_FTRS_E500_2 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ | 315 | #define CPU_FTRS_E500_2 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ |
316 | CPU_FTR_BIG_PHYS | CPU_FTR_NODSISRALIGN) | 316 | CPU_FTR_BIG_PHYS | CPU_FTR_NODSISRALIGN) |
317 | #define CPU_FTRS_GENERIC_32 (CPU_FTR_COMMON | CPU_FTR_NODSISRALIGN) | 317 | #define CPU_FTRS_GENERIC_32 (CPU_FTR_COMMON | CPU_FTR_NODSISRALIGN) |
318 | #ifdef __powerpc64__ | 318 | |
319 | /* 64-bit CPUs */ | ||
319 | #define CPU_FTRS_POWER3 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ | 320 | #define CPU_FTRS_POWER3 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ |
320 | CPU_FTR_HPTE_TABLE | CPU_FTR_IABR | CPU_FTR_PPC_LE) | 321 | CPU_FTR_HPTE_TABLE | CPU_FTR_IABR | CPU_FTR_PPC_LE) |
321 | #define CPU_FTRS_RS64 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ | 322 | #define CPU_FTRS_RS64 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ |
@@ -353,7 +354,6 @@ extern void do_feature_fixups(unsigned long value, void *fixup_start, | |||
353 | CPU_FTR_PURR | CPU_FTR_REAL_LE) | 354 | CPU_FTR_PURR | CPU_FTR_REAL_LE) |
354 | #define CPU_FTRS_COMPATIBLE (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ | 355 | #define CPU_FTRS_COMPATIBLE (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ |
355 | CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2) | 356 | CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2) |
356 | #endif | ||
357 | 357 | ||
358 | #ifdef __powerpc64__ | 358 | #ifdef __powerpc64__ |
359 | #define CPU_FTRS_POSSIBLE \ | 359 | #define CPU_FTRS_POSSIBLE \ |