diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 12:27:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 12:27:32 -0700 |
| commit | d9fcca40eba3266c1c8b6d9d7ab163861ad23b66 (patch) | |
| tree | 7d69afe258fa57a844b293b4c84c8369ae15b15a /arch/x86/Makefile | |
| parent | 7cc3afdf43ffb703db831292f3816d909fd44767 (diff) | |
| parent | 7a5917e9787dd73284f04e35c3cfdb39a67bf0d5 (diff) | |
| download | lwn-d9fcca40eba3266c1c8b6d9d7ab163861ad23b66.tar.gz lwn-d9fcca40eba3266c1c8b6d9d7ab163861ad23b66.zip | |
Merge branch 'x86-hash-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 hashing changes from Ingo Molnar:
"Small fixes and cleanups to the librarized arch_fast_hash() methods,
used by the net/openvswitch code"
* 'x86-hash-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, hash: Simplify switch, add __init annotation
x86, hash: Swap arguments passed to crc32_u32()
x86, hash: Fix build failure with older binutils
Diffstat (limited to 'arch/x86/Makefile')
| -rw-r--r-- | arch/x86/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index a414b1471ffc..3b9348a0c1a4 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -152,6 +152,7 @@ cfi-sections := $(call as-instr,.cfi_sections .debug_frame,-DCONFIG_AS_CFI_SECTI # does binutils support specific instructions? asinstr := $(call as-instr,fxsaveq (%rax),-DCONFIG_AS_FXSAVEQ=1) +asinstr += $(call as-instr,crc32l %eax$(comma)%eax,-DCONFIG_AS_CRC32=1) avx_instr := $(call as-instr,vxorps %ymm0$(comma)%ymm1$(comma)%ymm2,-DCONFIG_AS_AVX=1) avx2_instr :=$(call as-instr,vpbroadcastb %xmm0$(comma)%ymm1,-DCONFIG_AS_AVX2=1) |