diff options
-rw-r--r-- | include/asm-powerpc/cputable.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index d1cfa3f515ea..4b6f03444ffe 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h | |||
@@ -311,6 +311,11 @@ enum { | |||
311 | #endif | 311 | #endif |
312 | 312 | ||
313 | CPU_FTRS_POSSIBLE = | 313 | CPU_FTRS_POSSIBLE = |
314 | #ifdef __powerpc64__ | ||
315 | CPU_FTRS_POWER3 | CPU_FTRS_RS64 | CPU_FTRS_POWER4 | | ||
316 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | CPU_FTRS_CELL | | ||
317 | CPU_FTR_CI_LARGE_PAGE | | ||
318 | #else | ||
314 | #if CLASSIC_PPC | 319 | #if CLASSIC_PPC |
315 | CPU_FTRS_PPC601 | CPU_FTRS_603 | CPU_FTRS_604 | CPU_FTRS_740_NOTAU | | 320 | CPU_FTRS_PPC601 | CPU_FTRS_603 | CPU_FTRS_604 | CPU_FTRS_740_NOTAU | |
316 | CPU_FTRS_740 | CPU_FTRS_750 | CPU_FTRS_750FX1 | | 321 | CPU_FTRS_740 | CPU_FTRS_750 | CPU_FTRS_750FX1 | |
@@ -344,14 +349,14 @@ enum { | |||
344 | #ifdef CONFIG_E500 | 349 | #ifdef CONFIG_E500 |
345 | CPU_FTRS_E500 | CPU_FTRS_E500_2 | | 350 | CPU_FTRS_E500 | CPU_FTRS_E500_2 | |
346 | #endif | 351 | #endif |
347 | #ifdef __powerpc64__ | 352 | #endif /* __powerpc64__ */ |
348 | CPU_FTRS_POWER3 | CPU_FTRS_RS64 | CPU_FTRS_POWER4 | | ||
349 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | CPU_FTRS_CELL | | ||
350 | CPU_FTR_CI_LARGE_PAGE | | ||
351 | #endif | ||
352 | 0, | 353 | 0, |
353 | 354 | ||
354 | CPU_FTRS_ALWAYS = | 355 | CPU_FTRS_ALWAYS = |
356 | #ifdef __powerpc64__ | ||
357 | CPU_FTRS_POWER3 & CPU_FTRS_RS64 & CPU_FTRS_POWER4 & | ||
358 | CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & CPU_FTRS_CELL & | ||
359 | #else | ||
355 | #if CLASSIC_PPC | 360 | #if CLASSIC_PPC |
356 | CPU_FTRS_PPC601 & CPU_FTRS_603 & CPU_FTRS_604 & CPU_FTRS_740_NOTAU & | 361 | CPU_FTRS_PPC601 & CPU_FTRS_603 & CPU_FTRS_604 & CPU_FTRS_740_NOTAU & |
357 | CPU_FTRS_740 & CPU_FTRS_750 & CPU_FTRS_750FX1 & | 362 | CPU_FTRS_740 & CPU_FTRS_750 & CPU_FTRS_750FX1 & |
@@ -385,10 +390,7 @@ enum { | |||
385 | #ifdef CONFIG_E500 | 390 | #ifdef CONFIG_E500 |
386 | CPU_FTRS_E500 & CPU_FTRS_E500_2 & | 391 | CPU_FTRS_E500 & CPU_FTRS_E500_2 & |
387 | #endif | 392 | #endif |
388 | #ifdef __powerpc64__ | 393 | #endif /* __powerpc64__ */ |
389 | CPU_FTRS_POWER3 & CPU_FTRS_RS64 & CPU_FTRS_POWER4 & | ||
390 | CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & CPU_FTRS_CELL & | ||
391 | #endif | ||
392 | CPU_FTRS_POSSIBLE, | 394 | CPU_FTRS_POSSIBLE, |
393 | }; | 395 | }; |
394 | 396 | ||