diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-06 22:42:09 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-06 22:42:09 -0500 |
| commit | c6135234550ed89a6fd0e8cb229633967e41d649 (patch) | |
| tree | 22cef33e314839c4fb30d6fc888c0caa2a0f6602 /include/asm-powerpc/cputable.h | |
| parent | 76032de898f34db55b5048349db56557828a1390 (diff) | |
| parent | 0b154bb7d0cce80e9c0bcf11d4f9e71b59409d26 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-powerpc/cputable.h')
| -rw-r--r-- | include/asm-powerpc/cputable.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index c019501daceb..79a0556a0ab8 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h | |||
| @@ -101,6 +101,7 @@ extern void do_cpu_ftr_fixups(unsigned long offset); | |||
| 101 | #define CPU_FTR_COHERENT_ICACHE ASM_CONST(0x0000020000000000) | 101 | #define CPU_FTR_COHERENT_ICACHE ASM_CONST(0x0000020000000000) |
| 102 | #define CPU_FTR_LOCKLESS_TLBIE ASM_CONST(0x0000040000000000) | 102 | #define CPU_FTR_LOCKLESS_TLBIE ASM_CONST(0x0000040000000000) |
| 103 | #define CPU_FTR_MMCRA_SIHV ASM_CONST(0x0000080000000000) | 103 | #define CPU_FTR_MMCRA_SIHV ASM_CONST(0x0000080000000000) |
| 104 | #define CPU_FTR_CI_LARGE_PAGE ASM_CONST(0x0000100000000000) | ||
| 104 | #else | 105 | #else |
| 105 | /* ensure on 32b processors the flags are available for compiling but | 106 | /* ensure on 32b processors the flags are available for compiling but |
| 106 | * don't do anything */ | 107 | * don't do anything */ |
| @@ -116,6 +117,7 @@ extern void do_cpu_ftr_fixups(unsigned long offset); | |||
| 116 | #define CPU_FTR_COHERENT_ICACHE ASM_CONST(0x0) | 117 | #define CPU_FTR_COHERENT_ICACHE ASM_CONST(0x0) |
| 117 | #define CPU_FTR_LOCKLESS_TLBIE ASM_CONST(0x0) | 118 | #define CPU_FTR_LOCKLESS_TLBIE ASM_CONST(0x0) |
| 118 | #define CPU_FTR_MMCRA_SIHV ASM_CONST(0x0) | 119 | #define CPU_FTR_MMCRA_SIHV ASM_CONST(0x0) |
| 120 | #define CPU_FTR_CI_LARGE_PAGE ASM_CONST(0x0) | ||
| 119 | #endif | 121 | #endif |
| 120 | 122 | ||
| 121 | #ifndef __ASSEMBLY__ | 123 | #ifndef __ASSEMBLY__ |
| @@ -339,6 +341,7 @@ enum { | |||
| 339 | #ifdef __powerpc64__ | 341 | #ifdef __powerpc64__ |
| 340 | CPU_FTRS_POWER3 | CPU_FTRS_RS64 | CPU_FTRS_POWER4 | | 342 | CPU_FTRS_POWER3 | CPU_FTRS_RS64 | CPU_FTRS_POWER4 | |
| 341 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | CPU_FTRS_CELL | | 343 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | CPU_FTRS_CELL | |
| 344 | CPU_FTR_CI_LARGE_PAGE | | ||
| 342 | #endif | 345 | #endif |
| 343 | 0, | 346 | 0, |
| 344 | 347 | ||