diff options
author | Anton Blanchard <anton@samba.org> | 2006-06-10 06:32:01 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-06-15 05:31:26 -0400 |
commit | 227318bbde6c8309b1d20ab46532ec2b737e1fee (patch) | |
tree | de8bbbda0d69fc641629c10e5a0a1070a09bdde7 /include/asm-powerpc/cputable.h | |
parent | 8555a0029b1b0840237b750e55d4835a52cc719b (diff) |
[POWERPC] Remove stale 64bit on 32bit kernel code
Remove some stale POWER3/POWER4/970 on 32bit kernel support.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/cputable.h')
-rw-r--r-- | include/asm-powerpc/cputable.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index 69f2c242797f..da6f417d2ca7 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h | |||
@@ -300,13 +300,6 @@ extern void do_cpu_ftr_fixups(unsigned long offset); | |||
300 | CPU_FTR_COMMON) | 300 | CPU_FTR_COMMON) |
301 | #define CPU_FTRS_CLASSIC32 (CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \ | 301 | #define CPU_FTRS_CLASSIC32 (CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \ |
302 | CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE) | 302 | CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE) |
303 | #define CPU_FTRS_POWER3_32 (CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \ | ||
304 | CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE) | ||
305 | #define CPU_FTRS_POWER4_32 (CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \ | ||
306 | CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE | CPU_FTR_NODSISRALIGN) | ||
307 | #define CPU_FTRS_970_32 (CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \ | ||
308 | CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE | CPU_FTR_ALTIVEC_COMP | \ | ||
309 | CPU_FTR_MAYBE_CAN_NAP | CPU_FTR_NODSISRALIGN) | ||
310 | #define CPU_FTRS_8XX (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB) | 303 | #define CPU_FTRS_8XX (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB) |
311 | #define CPU_FTRS_40X (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ | 304 | #define CPU_FTRS_40X (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ |
312 | CPU_FTR_NODSISRALIGN) | 305 | CPU_FTR_NODSISRALIGN) |
@@ -367,12 +360,6 @@ enum { | |||
367 | #else | 360 | #else |
368 | CPU_FTRS_GENERIC_32 | | 361 | CPU_FTRS_GENERIC_32 | |
369 | #endif | 362 | #endif |
370 | #ifdef CONFIG_PPC64BRIDGE | ||
371 | CPU_FTRS_POWER3_32 | | ||
372 | #endif | ||
373 | #ifdef CONFIG_POWER4 | ||
374 | CPU_FTRS_POWER4_32 | CPU_FTRS_970_32 | | ||
375 | #endif | ||
376 | #ifdef CONFIG_8xx | 363 | #ifdef CONFIG_8xx |
377 | CPU_FTRS_8XX | | 364 | CPU_FTRS_8XX | |
378 | #endif | 365 | #endif |
@@ -412,12 +399,6 @@ enum { | |||
412 | #else | 399 | #else |
413 | CPU_FTRS_GENERIC_32 & | 400 | CPU_FTRS_GENERIC_32 & |
414 | #endif | 401 | #endif |
415 | #ifdef CONFIG_PPC64BRIDGE | ||
416 | CPU_FTRS_POWER3_32 & | ||
417 | #endif | ||
418 | #ifdef CONFIG_POWER4 | ||
419 | CPU_FTRS_POWER4_32 & CPU_FTRS_970_32 & | ||
420 | #endif | ||
421 | #ifdef CONFIG_8xx | 402 | #ifdef CONFIG_8xx |
422 | CPU_FTRS_8XX & | 403 | CPU_FTRS_8XX & |
423 | #endif | 404 | #endif |