[tip:x86/asm] x86/cpufeature: Replace cpu_has_apic with boot_cpu_has() usage

2016-04-13 Thread tip-bot for Borislav Petkov 
Commit-ID:  93984fbd4e33cc861d5b49caed02a02cbfb01340
Gitweb: http://git.kernel.org/tip/93984fbd4e33cc861d5b49caed02a02cbfb01340
Author: Borislav Petkov 
AuthorDate: Mon, 4 Apr 2016 22:25:00 +0200
Committer:  Ingo Molnar 
CommitDate: Wed, 13 Apr 2016 11:37:41 +0200

x86/cpufeature: Replace cpu_has_apic with boot_cpu_has() usage

Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Borislav Petkov 
Cc: Brian Gerst 
Cc: Denys Vlasenko 
Cc: H. Peter Anvin 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Cc: io...@lists.linux-foundation.org
Cc: linux...@vger.kernel.org
Cc: oprofile-l...@lists.sf.net
Link: http://lkml.kernel.org/r/1459801503-15600-8-git-send-email...@alien8.de
Signed-off-by: Ingo Molnar 
---
 arch/x86/events/core.c   |  2 +-
 arch/x86/include/asm/cpufeature.h|  1 -
 arch/x86/include/asm/irq_work.h  |  2 +-
 arch/x86/kernel/acpi/boot.c  |  8 
 arch/x86/kernel/apic/apic.c  | 20 ++--
 arch/x86/kernel/apic/apic_noop.c |  4 ++--
 arch/x86/kernel/apic/io_apic.c   |  2 +-
 arch/x86/kernel/apic/ipi.c   |  2 +-
 arch/x86/kernel/apic/vector.c|  2 +-
 arch/x86/kernel/cpu/amd.c|  4 ++--
 arch/x86/kernel/cpu/intel.c  |  2 +-
 arch/x86/kernel/cpu/mcheck/mce_intel.c   |  2 +-
 arch/x86/kernel/cpu/mcheck/therm_throt.c |  2 +-
 arch/x86/kernel/devicetree.c |  2 +-
 arch/x86/kernel/smpboot.c|  2 +-
 arch/x86/oprofile/nmi_int.c  |  2 +-
 arch/x86/pci/xen.c   |  2 +-
 drivers/cpufreq/longhaul.c   |  2 +-
 drivers/iommu/irq_remapping.c|  2 +-
 19 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 041e442..54c1745 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -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;
diff --git a/arch/x86/include/asm/cpufeature.h 
b/arch/x86/include/asm/cpufeature.h
index 8f58cd2..c532961 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -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)
diff --git a/arch/x86/include/asm/irq_work.h b/arch/x86/include/asm/irq_work.h
index d0afb05..f706041 100644
--- a/arch/x86/include/asm/irq_work.h
+++ b/arch/x86/include/asm/irq_work.h
@@ -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 */
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 8c2f1ef..2522e56 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -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;
 
/*
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 0b6509f..60078a6 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -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;

[tip:x86/asm] x86/cpufeature: Replace cpu_has_apic with boot_cpu_has() usage

2016-04-13 Thread tip-bot for Borislav Petkov 
Commit-ID:  93984fbd4e33cc861d5b49caed02a02cbfb01340
Gitweb: http://git.kernel.org/tip/93984fbd4e33cc861d5b49caed02a02cbfb01340
Author: Borislav Petkov 
AuthorDate: Mon, 4 Apr 2016 22:25:00 +0200
Committer:  Ingo Molnar 
CommitDate: Wed, 13 Apr 2016 11:37:41 +0200

x86/cpufeature: Replace cpu_has_apic with boot_cpu_has() usage

Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Borislav Petkov 
Cc: Brian Gerst 
Cc: Denys Vlasenko 
Cc: H. Peter Anvin 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Cc: io...@lists.linux-foundation.org
Cc: linux...@vger.kernel.org
Cc: oprofile-l...@lists.sf.net
Link: http://lkml.kernel.org/r/1459801503-15600-8-git-send-email...@alien8.de
Signed-off-by: Ingo Molnar 
---
 arch/x86/events/core.c   |  2 +-
 arch/x86/include/asm/cpufeature.h|  1 -
 arch/x86/include/asm/irq_work.h  |  2 +-
 arch/x86/kernel/acpi/boot.c  |  8 
 arch/x86/kernel/apic/apic.c  | 20 ++--
 arch/x86/kernel/apic/apic_noop.c |  4 ++--
 arch/x86/kernel/apic/io_apic.c   |  2 +-
 arch/x86/kernel/apic/ipi.c   |  2 +-
 arch/x86/kernel/apic/vector.c|  2 +-
 arch/x86/kernel/cpu/amd.c|  4 ++--
 arch/x86/kernel/cpu/intel.c  |  2 +-
 arch/x86/kernel/cpu/mcheck/mce_intel.c   |  2 +-
 arch/x86/kernel/cpu/mcheck/therm_throt.c |  2 +-
 arch/x86/kernel/devicetree.c |  2 +-
 arch/x86/kernel/smpboot.c|  2 +-
 arch/x86/oprofile/nmi_int.c  |  2 +-
 arch/x86/pci/xen.c   |  2 +-
 drivers/cpufreq/longhaul.c   |  2 +-
 drivers/iommu/irq_remapping.c|  2 +-
 19 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 041e442..54c1745 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -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;
diff --git a/arch/x86/include/asm/cpufeature.h 
b/arch/x86/include/asm/cpufeature.h
index 8f58cd2..c532961 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -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)
diff --git a/arch/x86/include/asm/irq_work.h b/arch/x86/include/asm/irq_work.h
index d0afb05..f706041 100644
--- a/arch/x86/include/asm/irq_work.h
+++ b/arch/x86/include/asm/irq_work.h
@@ -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 */
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 8c2f1ef..2522e56 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -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;
 
/*
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 0b6509f..60078a6 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -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.
 */
-