[patch 18/52] x86/apic: Move APIC noop specific functions

Thomas Gleixner
2017-09-13T21:44:51Z

[-- Attachment #1: x86-apic--Move-APIC-noop-specific-functions.patch --]
[-- Type: text/plain, Size: 1086 bytes --]

Move more inlines to the place where they belong.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/include/asm/apic.h | 7 -------
arch/x86/kernel/apic/apic_noop.c | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)

--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -514,13 +514,6 @@ extern void default_setup_apic_routing(v

extern struct apic apic_noop;

-#ifdef CONFIG_X86_32
-static inline int noop_x86_32_early_logical_apicid(int cpu)
-{
- return BAD_APICID;
-}
-#endif
-
extern int flat_cpu_mask_to_apicid(const struct cpumask *cpumask,
struct irq_data *irqdata,
unsigned int *apicid);
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -108,6 +108,13 @@ static void noop_apic_write(u32 reg, u32
WARN_ON_ONCE(boot_cpu_has(X86_FEATURE_APIC) && !disable_apic);
}

+#ifdef CONFIG_X86_32
+static int noop_x86_32_early_logical_apicid(int cpu)
+{
+ return BAD_APICID;
+}
+#endif
+
struct apic apic_noop __ro_after_init = {
.name = "noop",
.probe = noop_probe,