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

Commit 93984fbd authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/cpufeature: Replace cpu_has_apic with boot_cpu_has() usage 



Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: iommu@lists.linux-foundation.org
Cc: linux-pm@vger.kernel.org
Cc: oprofile-list@lists.sf.net
Link: http://lkml.kernel.org/r/1459801503-15600-8-git-send-email-bp@alien8.de


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

arch/x86/events/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1518,7 +1518,7 @@ x86_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu) 


static void __init pmu_check_apic(void)

{

	if (cpu_has_apic)

	if (boot_cpu_has(X86_FEATURE_APIC))

		return;



	x86_pmu.apic = 0;

arch/x86/include/asm/cpufeature.h

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
	set_bit(bit, (unsigned long *)cpu_caps_set);	\

} while (0)



#define cpu_has_apic		boot_cpu_has(X86_FEATURE_APIC)

#define cpu_has_fxsr		boot_cpu_has(X86_FEATURE_FXSR)

#define cpu_has_xsave		boot_cpu_has(X86_FEATURE_XSAVE)

#define cpu_has_xsaves		boot_cpu_has(X86_FEATURE_XSAVES)

arch/x86/include/asm/irq_work.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


static inline bool arch_irq_work_has_interrupt(void)

{

	return cpu_has_apic;

	return boot_cpu_has(X86_FEATURE_APIC);

}



#endif /* _ASM_IRQ_WORK_H */

arch/x86/kernel/acpi/boot.c

+4 −4
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int __init acpi_parse_madt(struct acpi_table_header *table) 
{

	struct acpi_table_madt *madt = NULL;



	if (!cpu_has_apic)

	if (!boot_cpu_has(X86_FEATURE_APIC))

		return -EINVAL;



	madt = (struct acpi_table_madt *)table;
@@ -951,7 +951,7 @@ static int __init early_acpi_parse_madt_lapic_addr_ovr(void) 
{

	int count;



	if (!cpu_has_apic)

	if (!boot_cpu_has(X86_FEATURE_APIC))

		return -ENODEV;



	/*
@@ -979,7 +979,7 @@ static int __init acpi_parse_madt_lapic_entries(void) 
	int ret;

	struct acpi_subtable_proc madt_proc[2];



	if (!cpu_has_apic)

	if (!boot_cpu_has(X86_FEATURE_APIC))

		return -ENODEV;



	/*
@@ -1125,7 +1125,7 @@ static int __init acpi_parse_madt_ioapic_entries(void) 
	if (acpi_disabled || acpi_noirq)

		return -ENODEV;



	if (!cpu_has_apic)

	if (!boot_cpu_has(X86_FEATURE_APIC))

		return -ENODEV;



	/*

arch/x86/kernel/apic/apic.c

+10 −10
Original line number Diff line number Diff line
@@ -1085,7 +1085,7 @@ void lapic_shutdown(void) 
{

	unsigned long flags;



	if (!cpu_has_apic && !apic_from_smp_config())

	if (!boot_cpu_has(X86_FEATURE_APIC) && !apic_from_smp_config())

		return;



	local_irq_save(flags);
@@ -1134,7 +1134,7 @@ void __init init_bsp_APIC(void) 
	 * Don't do the setup now if we have a SMP BIOS as the

	 * through-I/O-APIC virtual wire mode might be active.

	 */

	if (smp_found_config || !cpu_has_apic)

	if (smp_found_config || !boot_cpu_has(X86_FEATURE_APIC))

		return;



	/*
@@ -1445,7 +1445,7 @@ static void __x2apic_disable(void) 
{

	u64 msr;



	if (!cpu_has_apic)

	if (!boot_cpu_has(X86_FEATURE_APIC))

		return;



	rdmsrl(MSR_IA32_APICBASE, msr);
@@ -1632,7 +1632,7 @@ void __init enable_IR_x2apic(void) 
 */

static int __init detect_init_APIC(void)

{

	if (!cpu_has_apic) {

	if (!boot_cpu_has(X86_FEATURE_APIC)) {

		pr_info("No local APIC present\n");

		return -1;

	}
@@ -1711,14 +1711,14 @@ static int __init detect_init_APIC(void) 
		goto no_apic;

	case X86_VENDOR_INTEL:

		if (boot_cpu_data.x86 == 6 || boot_cpu_data.x86 == 15 ||

		    (boot_cpu_data.x86 == 5 && cpu_has_apic))

		    (boot_cpu_data.x86 == 5 && boot_cpu_has(X86_FEATURE_APIC)))

			break;

		goto no_apic;

	default:

		goto no_apic;

	}



	if (!cpu_has_apic) {

	if (!boot_cpu_has(X86_FEATURE_APIC)) {

		/*

		 * Over-ride BIOS and try to enable the local APIC only if

		 * "lapic" specified.
@@ -2233,19 +2233,19 @@ int __init APIC_init_uniprocessor(void) 
		return -1;

	}

#ifdef CONFIG_X86_64

	if (!cpu_has_apic) {

	if (!boot_cpu_has(X86_FEATURE_APIC)) {

		disable_apic = 1;

		pr_info("Apic disabled by BIOS\n");

		return -1;

	}

#else

	if (!smp_found_config && !cpu_has_apic)

	if (!smp_found_config && !boot_cpu_has(X86_FEATURE_APIC))

		return -1;



	/*

	 * Complain if the BIOS pretends there is one.

	 */

	if (!cpu_has_apic &&

	if (!boot_cpu_has(X86_FEATURE_APIC) &&

	    APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) {

		pr_err("BIOS bug, local APIC 0x%x not detected!...\n",

			boot_cpu_physical_apicid);
@@ -2426,7 +2426,7 @@ static void apic_pm_activate(void) 
static int __init init_lapic_sysfs(void)

{

	/* XXX: remove suspend/resume procs if !apic_pm_state.active? */

	if (cpu_has_apic)

	if (boot_cpu_has(X86_FEATURE_APIC))

		register_syscore_ops(&lapic_syscore_ops);



	return 0;