diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-10-04 11:08:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-10-04 11:09:08 +0200 |
| commit | 22f92bacbeea24b20e447444c28e7cad9f1ac3f8 (patch) | |
| tree | 5c3f2346804a186aa2d954f078fd2f4d44bcc26e /arch/sparc/include/asm/xor_64.h | |
| parent | 557ab425429a5123d37f412ce3e6d6137cb621f8 (diff) | |
| parent | 0f86267b79bc6e357b8606077c7f70239045ea9c (diff) | |
| download | linux-3.10-22f92bacbeea24b20e447444c28e7cad9f1ac3f8.tar.gz linux-3.10-22f92bacbeea24b20e447444c28e7cad9f1ac3f8.tar.bz2 linux-3.10-22f92bacbeea24b20e447444c28e7cad9f1ac3f8.zip | |
Merge branch 'linus' into sched/core
Merge reason: pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/include/asm/xor_64.h')
| -rw-r--r-- | arch/sparc/include/asm/xor_64.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/xor_64.h b/arch/sparc/include/asm/xor_64.h index 9ed6ff679ab..ee8edc68423 100644 --- a/arch/sparc/include/asm/xor_64.h +++ b/arch/sparc/include/asm/xor_64.h @@ -66,6 +66,8 @@ static struct xor_block_template xor_block_niagara = { ((tlb_type == hypervisor && \ (sun4v_chip_type == SUN4V_CHIP_NIAGARA1 || \ sun4v_chip_type == SUN4V_CHIP_NIAGARA2 || \ - sun4v_chip_type == SUN4V_CHIP_NIAGARA3)) ? \ + sun4v_chip_type == SUN4V_CHIP_NIAGARA3 || \ + sun4v_chip_type == SUN4V_CHIP_NIAGARA4 || \ + sun4v_chip_type == SUN4V_CHIP_NIAGARA5)) ? \ &xor_block_niagara : \ &xor_block_VIS) |