diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2014-08-06 04:26:28 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-09 17:59:29 -0500 |
commit | 90029640fd5963343fb862d419db161bc0424120 (patch) | |
tree | c19a9d61d3e307bf0bbaa15e4b7c81b4f424e64d /arch/powerpc/include | |
parent | 66f3d4fe0ba8f38df6141cc0b6ec145be6e63f0e (diff) |
powerpc: Remove unused CPU_FTRS_A2
In commit fb5a515704d7 "Remove platforms/wsp and associated pieces" we
removed the last user of CPU_FTRS_A2, so we should remove it too.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r-- | arch/powerpc/include/asm/cputable.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h index 42d8b33d1623..22d5a7da9e68 100644 --- a/arch/powerpc/include/asm/cputable.h +++ b/arch/powerpc/include/asm/cputable.h | |||
@@ -448,13 +448,9 @@ extern const char *powerpc_base_platform; | |||
448 | CPU_FTR_PURR | CPU_FTR_REAL_LE | CPU_FTR_DABRX) | 448 | CPU_FTR_PURR | CPU_FTR_REAL_LE | CPU_FTR_DABRX) |
449 | #define CPU_FTRS_COMPATIBLE (CPU_FTR_USE_TB | CPU_FTR_PPCAS_ARCH_V2) | 449 | #define CPU_FTRS_COMPATIBLE (CPU_FTR_USE_TB | CPU_FTR_PPCAS_ARCH_V2) |
450 | 450 | ||
451 | #define CPU_FTRS_A2 (CPU_FTR_USE_TB | CPU_FTR_SMT | CPU_FTR_DBELL | \ | ||
452 | CPU_FTR_NOEXECUTE | CPU_FTR_NODSISRALIGN | \ | ||
453 | CPU_FTR_ICSWX | CPU_FTR_DABRX ) | ||
454 | |||
455 | #ifdef __powerpc64__ | 451 | #ifdef __powerpc64__ |
456 | #ifdef CONFIG_PPC_BOOK3E | 452 | #ifdef CONFIG_PPC_BOOK3E |
457 | #define CPU_FTRS_POSSIBLE (CPU_FTRS_E6500 | CPU_FTRS_E5500 | CPU_FTRS_A2) | 453 | #define CPU_FTRS_POSSIBLE (CPU_FTRS_E6500 | CPU_FTRS_E5500) |
458 | #else | 454 | #else |
459 | #define CPU_FTRS_POSSIBLE \ | 455 | #define CPU_FTRS_POSSIBLE \ |
460 | (CPU_FTRS_POWER4 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | \ | 456 | (CPU_FTRS_POWER4 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | \ |
@@ -505,7 +501,7 @@ enum { | |||
505 | 501 | ||
506 | #ifdef __powerpc64__ | 502 | #ifdef __powerpc64__ |
507 | #ifdef CONFIG_PPC_BOOK3E | 503 | #ifdef CONFIG_PPC_BOOK3E |
508 | #define CPU_FTRS_ALWAYS (CPU_FTRS_E6500 & CPU_FTRS_E5500 & CPU_FTRS_A2) | 504 | #define CPU_FTRS_ALWAYS (CPU_FTRS_E6500 & CPU_FTRS_E5500) |
509 | #else | 505 | #else |
510 | #define CPU_FTRS_ALWAYS \ | 506 | #define CPU_FTRS_ALWAYS \ |
511 | (CPU_FTRS_POWER4 & CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & \ | 507 | (CPU_FTRS_POWER4 & CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & \ |