diff options
author | Borislav Petkov <bp@suse.de> | 2016-03-29 11:42:00 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-03-31 07:35:09 -0400 |
commit | 054efb6467f84490bdf92afab6d9dbd5102e620a (patch) | |
tree | 0cd41e8f6f42f8eb7e3061998192fdc8e19cde39 /arch/x86/lib | |
parent | 906bf7fda2c9cf5c1762ec607943ed54b6c5b203 (diff) |
x86/cpufeature: Remove cpu_has_xmm2
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-crypto@vger.kernel.org
Link: http://lkml.kernel.org/r/1459266123-21878-8-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/lib')
-rw-r--r-- | arch/x86/lib/usercopy_32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c index 91d93b95bd86..b559d9238781 100644 --- a/arch/x86/lib/usercopy_32.c +++ b/arch/x86/lib/usercopy_32.c | |||
@@ -612,7 +612,7 @@ unsigned long __copy_from_user_ll_nocache(void *to, const void __user *from, | |||
612 | { | 612 | { |
613 | stac(); | 613 | stac(); |
614 | #ifdef CONFIG_X86_INTEL_USERCOPY | 614 | #ifdef CONFIG_X86_INTEL_USERCOPY |
615 | if (n > 64 && cpu_has_xmm2) | 615 | if (n > 64 && static_cpu_has(X86_FEATURE_XMM2)) |
616 | n = __copy_user_zeroing_intel_nocache(to, from, n); | 616 | n = __copy_user_zeroing_intel_nocache(to, from, n); |
617 | else | 617 | else |
618 | __copy_user_zeroing(to, from, n); | 618 | __copy_user_zeroing(to, from, n); |
@@ -629,7 +629,7 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr | |||
629 | { | 629 | { |
630 | stac(); | 630 | stac(); |
631 | #ifdef CONFIG_X86_INTEL_USERCOPY | 631 | #ifdef CONFIG_X86_INTEL_USERCOPY |
632 | if (n > 64 && cpu_has_xmm2) | 632 | if (n > 64 && static_cpu_has(X86_FEATURE_XMM2)) |
633 | n = __copy_user_intel_nocache(to, from, n); | 633 | n = __copy_user_intel_nocache(to, from, n); |
634 | else | 634 | else |
635 | __copy_user(to, from, n); | 635 | __copy_user(to, from, n); |