[tip:x86/apic] x86/apic: Move apic_flat_64 header into apic directory

tip-bot for Thomas Gleixner
2019-07-25T14:26:14Z

Commit-ID: ba77b2a02e0099ab0021bc3169b8f674c6be19f0
Gitweb: https://git.kernel.org/tip/ba77b2a02e0099ab0021bc3169b8f674c6be19f0
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Mon, 22 Jul 2019 20:47:13 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 25 Jul 2019 16:11:58 +0200

x86/apic: Move apic_flat_64 header into apic directory

Only used locally.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20190722105219.526508168@linutronix.de

---
arch/x86/kernel/apic/apic_flat_64.c | 2 +-
arch/x86/{include/asm => kernel/apic}/apic_flat_64.h | 0
arch/x86/kernel/apic/apic_numachip.c | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index a38b1ecc018d..cfee2e546531 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -13,9 +13,9 @@
#include <linux/acpi.h>

#include <asm/jailhouse_para.h>
-#include <asm/apic_flat_64.h>
#include <asm/apic.h>

+#include "apic_flat_64.h"
#include "ipi.h"

static struct apic apic_physflat;
diff --git a/arch/x86/include/asm/apic_flat_64.h b/arch/x86/kernel/apic/apic_flat_64.h
similarity index 100%
rename from arch/x86/include/asm/apic_flat_64.h
rename to arch/x86/kernel/apic/apic_flat_64.h
diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
index 7d4c00f4e984..09ec9ffb268e 100644
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -16,9 +16,9 @@
#include <asm/numachip/numachip.h>
#include <asm/numachip/numachip_csr.h>

-#include <asm/apic_flat_64.h>
#include <asm/pgtable.h>

+#include "apic_flat_64.h"
#include "ipi.h"

u8 numachip_system __read_mostly;