aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-15 13:43:45 +0100
committerMark Brown <broonie@linaro.org>2013-09-15 13:43:45 +0100
commitdafe3258c5449e2697097285c37c761915053eae (patch)
tree3132efe10ff5766feae3311993cd7eef7e75d6f3 /arch/x86
parent15812f79511f4b94ee42f35c9095ba0c0cb5204c (diff)
parent4ed4d44eb2192604716226a6f0edad02ab76101f (diff)
downloadlinaro-lsk-dafe3258c5449e2697097285c37c761915053eae.tar.gz
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-android-13.09
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/xor_avx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/xor_avx.h b/arch/x86/include/asm/xor_avx.h
index 7ea79c5fa1f..492b29802f5 100644
--- a/arch/x86/include/asm/xor_avx.h
+++ b/arch/x86/include/asm/xor_avx.h
@@ -167,12 +167,12 @@ static struct xor_block_template xor_block_avx = {
#define AVX_XOR_SPEED \
do { \
- if (cpu_has_avx) \
+ if (cpu_has_avx && cpu_has_osxsave) \
xor_speed(&xor_block_avx); \
} while (0)
#define AVX_SELECT(FASTEST) \
- (cpu_has_avx ? &xor_block_avx : FASTEST)
+ (cpu_has_avx && cpu_has_osxsave ? &xor_block_avx : FASTEST)
#else