diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 12:09:53 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 12:09:53 -0400 |
commit | 044c31fdf80ed9d8e6bfb33913d085c3efc6febe (patch) | |
tree | 9252cd09defdd29742af6b2bd22db72ce252ab1a /arch/sparc/include/asm/xor_64.h | |
parent | af7a950284af5526a26b4ae4809c1104b4dc47f3 (diff) | |
parent | c5624f554600ab812fe235690665ee81413cebc3 (diff) |
Merge commit 'v3.0.2' into linaro-3.0
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 bee4bf4be3a..9ed6ff679ab 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) |