diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 12:05:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 12:05:55 -0400 |
| commit | c548f08a4f7b89b93c805e0c4024b8302afa7121 (patch) | |
| tree | 5cf791db4912831469b70390aa58376f1c724386 /include/asm-powerpc/cputable.h | |
| parent | 347c53dca73fca317d57781f510f5ff4f6c0d0d7 (diff) | |
| parent | 4acadb965c4aa587aac29a0a91203c4745d6fb4e (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (24 commits)
[POWERPC] Fix vmemmap warning in init_64.c
[POWERPC] Fix 64 bits vDSO DWARF info for CR register
[POWERPC] Add 1TB workaround for PA6T
[POWERPC] Enable NO_HZ and high res timers for pseries and ppc64 configs
[POWERPC] Quieten cache information at boot
[POWERPC] Quieten clockevent printk
[POWERPC] Enable SLUB in *_defconfig
[POWERPC] Fix 1TB segment detection
[POWERPC] Fix iSeries_hpte_insert prototype
[POWERPC] Fix copyright symbol
[POWERPC] ibmebus: Move to of_device and of_platform_driver, match eHCA and eHEA drivers
[POWERPC] ibmebus: Add device creation and bus probing based on of_device
[POWERPC] ibmebus: Remove bus match/probe/remove functions
[POWERPC] Move of_device allocation into of_device.[ch]
[POWERPC] mpc52xx: device tree changes for FEC and MDIO
[POWERPC] bestcomm: GenBD task support
[POWERPC] bestcomm: FEC task support
[POWERPC] bestcomm: ATA task support
[POWERPC] bestcomm: core bestcomm support for Freescale MPC5200
[POWERPC] mpc52xx: Update mpc52xx_psc structure with B revision changes
...
Diffstat (limited to 'include/asm-powerpc/cputable.h')
| -rw-r--r-- | include/asm-powerpc/cputable.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index ae093ef68363..9d74338e3dec 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h | |||
| @@ -165,6 +165,7 @@ extern void do_feature_fixups(unsigned long value, void *fixup_start, | |||
| 165 | #define CPU_FTR_SPURR LONG_ASM_CONST(0x0001000000000000) | 165 | #define CPU_FTR_SPURR LONG_ASM_CONST(0x0001000000000000) |
| 166 | #define CPU_FTR_DSCR LONG_ASM_CONST(0x0002000000000000) | 166 | #define CPU_FTR_DSCR LONG_ASM_CONST(0x0002000000000000) |
| 167 | #define CPU_FTR_1T_SEGMENT LONG_ASM_CONST(0x0004000000000000) | 167 | #define CPU_FTR_1T_SEGMENT LONG_ASM_CONST(0x0004000000000000) |
| 168 | #define CPU_FTR_NO_SLBIE_B LONG_ASM_CONST(0x0008000000000000) | ||
| 168 | 169 | ||
| 169 | #ifndef __ASSEMBLY__ | 170 | #ifndef __ASSEMBLY__ |
| 170 | 171 | ||
| @@ -367,7 +368,7 @@ extern void do_feature_fixups(unsigned long value, void *fixup_start, | |||
| 367 | #define CPU_FTRS_PA6T (CPU_FTR_USE_TB | \ | 368 | #define CPU_FTRS_PA6T (CPU_FTR_USE_TB | \ |
| 368 | CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \ | 369 | CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \ |
| 369 | CPU_FTR_ALTIVEC_COMP | CPU_FTR_CI_LARGE_PAGE | \ | 370 | CPU_FTR_ALTIVEC_COMP | CPU_FTR_CI_LARGE_PAGE | \ |
| 370 | CPU_FTR_PURR | CPU_FTR_REAL_LE) | 371 | CPU_FTR_PURR | CPU_FTR_REAL_LE | CPU_FTR_NO_SLBIE_B) |
| 371 | #define CPU_FTRS_COMPATIBLE (CPU_FTR_USE_TB | \ | 372 | #define CPU_FTRS_COMPATIBLE (CPU_FTR_USE_TB | \ |
| 372 | CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2) | 373 | CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2) |
| 373 | 374 | ||