[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-8b542da372875373db9688477671151df3418acb@git.kernel.org>
Date: Thu, 25 Jul 2019 07:25:12 -0700
From: tip-bot for Thomas Gleixner <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, peterz@...radead.org,
tglx@...utronix.de, mingo@...nel.org
Subject: [tip:x86/apic] x86/apic: Move ipi header into apic directory
Commit-ID: 8b542da372875373db9688477671151df3418acb
Gitweb: https://git.kernel.org/tip/8b542da372875373db9688477671151df3418acb
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Mon, 22 Jul 2019 20:47:12 +0200
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Thu, 25 Jul 2019 16:11:57 +0200
x86/apic: Move ipi header into apic directory
Only used locally.
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Link: https://lkml.kernel.org/r/20190722105219.434738036@linutronix.de
---
arch/x86/kernel/apic/apic_flat_64.c | 3 ++-
arch/x86/kernel/apic/apic_numachip.c | 3 ++-
arch/x86/kernel/apic/bigsmp_32.c | 9 ++-------
arch/x86/kernel/apic/ipi.c | 3 ++-
arch/x86/{include/asm => kernel/apic}/ipi.h | 0
arch/x86/kernel/apic/probe_32.c | 3 ++-
arch/x86/kernel/apic/probe_64.c | 3 ++-
arch/x86/kernel/apic/x2apic_phys.c | 3 +--
8 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 8d7242df1fd6..a38b1ecc018d 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -15,7 +15,8 @@
#include <asm/jailhouse_para.h>
#include <asm/apic_flat_64.h>
#include <asm/apic.h>
-#include <asm/ipi.h>
+
+#include "ipi.h"
static struct apic apic_physflat;
static struct apic apic_flat;
diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
index e071e8dcb097..7d4c00f4e984 100644
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -18,7 +18,8 @@
#include <asm/apic_flat_64.h>
#include <asm/pgtable.h>
-#include <asm/ipi.h>
+
+#include "ipi.h"
u8 numachip_system __read_mostly;
static const struct apic apic_numachip1;
diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index afee386ff711..2c031b75dfce 100644
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -4,18 +4,13 @@
*
* Drives the local APIC in "clustered mode".
*/
-#include <linux/threads.h>
#include <linux/cpumask.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/dmi.h>
#include <linux/smp.h>
-#include <asm/apicdef.h>
-#include <asm/fixmap.h>
-#include <asm/mpspec.h>
#include <asm/apic.h>
-#include <asm/ipi.h>
+
+#include "ipi.h"
static unsigned bigsmp_get_apic_id(unsigned long x)
{
diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c
index dad523bbe701..0f26141d479c 100644
--- a/arch/x86/kernel/apic/ipi.c
+++ b/arch/x86/kernel/apic/ipi.c
@@ -3,7 +3,8 @@
#include <linux/cpumask.h>
#include <asm/apic.h>
-#include <asm/ipi.h>
+
+#include "ipi.h"
void __default_send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest)
{
diff --git a/arch/x86/include/asm/ipi.h b/arch/x86/kernel/apic/ipi.h
similarity index 100%
rename from arch/x86/include/asm/ipi.h
rename to arch/x86/kernel/apic/ipi.h
diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index 8f3c7f50b0a9..40b786e3427a 100644
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -11,7 +11,8 @@
#include <asm/apic.h>
#include <asm/acpi.h>
-#include <asm/ipi.h>
+
+#include "ipi.h"
#ifdef CONFIG_HOTPLUG_CPU
#define DEFAULT_SEND_IPI (1)
diff --git a/arch/x86/kernel/apic/probe_64.c b/arch/x86/kernel/apic/probe_64.c
index f7bd3f48deb2..6268c487f963 100644
--- a/arch/x86/kernel/apic/probe_64.c
+++ b/arch/x86/kernel/apic/probe_64.c
@@ -9,7 +9,8 @@
* James Cleverdon.
*/
#include <asm/apic.h>
-#include <asm/ipi.h>
+
+#include "ipi.h"
/*
* Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
index e5289a0c595b..3bde4724c1c7 100644
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -3,9 +3,8 @@
#include <linux/cpumask.h>
#include <linux/acpi.h>
-#include <asm/ipi.h>
-
#include "x2apic.h"
+#include "ipi.h"
int x2apic_phys;
Powered by blists - more mailing lists