Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62436a4d authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/cpufeature: Remove cpu_has_x2apic 



Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1459266123-21878-5-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent ab4a56fa

arch/ia64/include/asm/iommu.h

+0 −1
Original line number Diff line number Diff line 
#ifndef _ASM_IA64_IOMMU_H

#define _ASM_IA64_IOMMU_H 1



#define cpu_has_x2apic 0

/* 10 seconds */

#define DMAR_OPERATION_TIMEOUT (((cycles_t) local_cpu_data->itc_freq)*10)

arch/x86/include/asm/apic.h

+2 −2
Original line number Diff line number Diff line
@@ -239,10 +239,10 @@ extern void __init check_x2apic(void); 
extern void x2apic_setup(void);

static inline int x2apic_enabled(void)

{

	return cpu_has_x2apic && apic_is_x2apic_enabled();

	return boot_cpu_has(X86_FEATURE_X2APIC) && apic_is_x2apic_enabled();

}



#define x2apic_supported()	(cpu_has_x2apic)

#define x2apic_supported()	(boot_cpu_has(X86_FEATURE_X2APIC))

#else /* !CONFIG_X86_X2APIC */

static inline void check_x2apic(void) { }

static inline void x2apic_setup(void) { }

arch/x86/include/asm/cpufeature.h

+0 −1
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
#define cpu_has_clflush		boot_cpu_has(X86_FEATURE_CLFLUSH)

#define cpu_has_gbpages		boot_cpu_has(X86_FEATURE_GBPAGES)

#define cpu_has_pat		boot_cpu_has(X86_FEATURE_PAT)

#define cpu_has_x2apic		boot_cpu_has(X86_FEATURE_X2APIC)

#define cpu_has_xsave		boot_cpu_has(X86_FEATURE_XSAVE)

#define cpu_has_xsaves		boot_cpu_has(X86_FEATURE_XSAVES)

/*

arch/x86/kernel/apic/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -1561,7 +1561,7 @@ void __init check_x2apic(void) 
		pr_info("x2apic: enabled by BIOS, switching to x2apic ops\n");

		x2apic_mode = 1;

		x2apic_state = X2APIC_ON;

	} else if (!cpu_has_x2apic) {

	} else if (!boot_cpu_has(X86_FEATURE_X2APIC)) {

		x2apic_state = X2APIC_DISABLED;

	}

}