diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-28 05:59:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-28 05:59:19 -0700 |
| commit | 55f9c40ff632d03c527d6a6ceddcda0a224587a6 (patch) | |
| tree | 215b843439f1d6b7620789ac6e919742db99b7a6 /arch/sparc/include/asm/xor_64.h | |
| parent | d5eab9152a3b4ce962c02ad0a0e4d0ec94aadd92 (diff) | |
| parent | eb7caf35951b1a56aabee028c1b20727abccc34f (diff) | |
| download | talos-obmc-linux-55f9c40ff632d03c527d6a6ceddcda0a224587a6.tar.gz talos-obmc-linux-55f9c40ff632d03c527d6a6ceddcda0a224587a6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
n2_crypto: Attach on Niagara-T3.
n2rng: Attach on Niagara-T3.
sparc: Detect and handle UltraSPARC-T3 cpu types.
sparc: Don't do expensive hypervisor PCR write unless necessary.
sparc: Add T3 sun4v cpu type and hypervisor group defines.
sparc: Don't leave sparc_pmu_type NULL on sun4v.
Diffstat (limited to 'arch/sparc/include/asm/xor_64.h')
| -rw-r--r-- | arch/sparc/include/asm/xor_64.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/xor_64.h b/arch/sparc/include/asm/xor_64.h index bee4bf4be3af..9ed6ff679ab7 100644 --- a/arch/sparc/include/asm/xor_64.h +++ b/arch/sparc/include/asm/xor_64.h @@ -65,6 +65,7 @@ static struct xor_block_template xor_block_niagara = { #define XOR_SELECT_TEMPLATE(FASTEST) \ ((tlb_type == hypervisor && \ (sun4v_chip_type == SUN4V_CHIP_NIAGARA1 || \ - sun4v_chip_type == SUN4V_CHIP_NIAGARA2)) ? \ + sun4v_chip_type == SUN4V_CHIP_NIAGARA2 || \ + sun4v_chip_type == SUN4V_CHIP_NIAGARA3)) ? \ &xor_block_niagara : \ &xor_block_VIS) |
