diff options
author | Len Brown <len.brown@intel.com> | 2006-06-19 18:01:24 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-19 18:01:24 -0400 |
commit | ae6c859b7dcd708efadf1c76279c33db213e3506 (patch) | |
tree | c18c2e94537d5e3d4fde5bf52800333b7c237048 /include/asm-powerpc | |
parent | 5b4b7a236e7787f16af4e15a6253d46d8e794be6 (diff) | |
parent | 427abfa28afedffadfca9dd8b067eb6d36bac53f (diff) |
merge linus into release branch
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r-- | include/asm-powerpc/cputable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index 9fcf0162d85..f6265c2a0dd 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h @@ -329,7 +329,7 @@ extern void do_cpu_ftr_fixups(unsigned long offset); #define CPU_FTRS_CELL (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \ CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \ - CPU_FTR_CTRL | CPU_FTR_PAUSE_ZERO) + CPU_FTR_CTRL | CPU_FTR_PAUSE_ZERO | CPU_FTR_CI_LARGE_PAGE) #define CPU_FTRS_COMPATIBLE (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2) #endif |