Skip to content

Commit

Permalink
x86_64: vdso32 cleanup using feature flags
Browse files Browse the repository at this point in the history
Use the X86_FEATURE_SYSENTER32 to remove hard-coded CPU vendor check.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Jeremy Fitzhardinge authored and Ingo Molnar committed Jul 11, 2008
1 parent 8d28aab commit b6ad92d
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions arch/x86/vdso/vdso32-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit b6ad92d

Please sign in to comment.