Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 10 deletions

diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index cf058fecfcee..0bce5429a515 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -203,20 +203,11 @@ static struct page *vdso32_pages[1];
 
 #ifdef CONFIG_X86_64
 
-static int use_sysenter __read_mostly = -1;
-
-#define vdso32_sysenter()       (use_sysenter > 0)
+#define vdso32_sysenter()       (boot_cpu_has(X86_FEATURE_SYSENTER32))
 
 /* May not be __init: called during resume */
 void syscall32_cpu_init(void)
 {
-        if (use_sysenter < 0) {
-                if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)
-                        use_sysenter = 1;
-                if (boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR)
-                        use_sysenter = 1;
-        }
-
         /* Load these always in case some future AMD CPU supports
            SYSENTER from compat mode too. */
         checking_wrmsrl(MSR_IA32_SYSENTER_CS, (u64)__KERNEL_CS);