xen/mm: Exclude flushtlb.h from mm.h for x86

Various files pick up flushtlb.h transitively through mm.h.  Fix these, and
finally resolve the TODO in microcode/amd.c

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Julien Grall <julien@xen.org>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
CC: Bertrand Marquis <bertrand.marquis@arm.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
CC: Shawn Anastasio <sanastasio@raptorengineering.com>
v2:
 * hyperv/tlb.c as well

diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c
index 46b04c9cb83d386db2731d95e6ed778255baf1d1..d97eda129c3269825050561742e42138918353d2 100644 (file)
--- a/xen/arch/x86/alternative.c
+++ b/xen/arch/x86/alternative.c
@@ -10,6 +10,7 @@
 #include <asm/alternative.h>
 #include <asm/apic.h>
 #include <asm/endbr.h>
+#include <asm/flushtlb.h>
 #include <asm/nmi.h>
 #include <asm/nops.h>
 #include <asm/processor.h>

diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c
index ee7de5282b2a0bd78852b7f40e64755b122f63f8..d84dc5b0ef1fee3add60ef4fdf103e9788d79231 100644 (file)
--- a/xen/arch/x86/cpu/microcode/amd.c
+++ b/xen/arch/x86/cpu/microcode/amd.c
@@ -17,9 +17,9 @@
 #include <xen/bsearch.h>
 #include <xen/err.h>
 #include <xen/init.h>
-#include <xen/mm.h> /* TODO: Fix asm/tlbflush.h breakage */
 #include <xen/sha2.h>
 
+#include <asm/flushtlb.h>
 #include <asm/msr.h>
 
 #include "private.h"

diff --git a/xen/arch/x86/guest/hyperv/tlb.c b/xen/arch/x86/guest/hyperv/tlb.c
index ef930efa954ba2e462c038c6fdaa5e60d1390075..de459c2accafdb1c8ccc9571eac048d0d6ca25e7 100644 (file)
--- a/xen/arch/x86/guest/hyperv/tlb.c
+++ b/xen/arch/x86/guest/hyperv/tlb.c
@@ -11,6 +11,7 @@
 #include <xen/cpumask.h>
 #include <xen/errno.h>
 
+#include <asm/flushtlb.h>
 #include <asm/guest/hyperv.h>
 #include <asm/guest/hyperv-hcall.h>
 #include <asm/guest/hyperv-tlfs.h>

diff --git a/xen/arch/x86/livepatch.c b/xen/arch/x86/livepatch.c
index 5158e91f7e6e3b033b091e34a3c27fb76eb47ee2..5c1d16ecf5a8152b25367ef56b683d783d1e7b42 100644 (file)
--- a/xen/arch/x86/livepatch.c
+++ b/xen/arch/x86/livepatch.c
@@ -16,6 +16,7 @@
 
 #include <asm/endbr.h>
 #include <asm/fixmap.h>
+#include <asm/flushtlb.h>
 #include <asm/nmi.h>
 #include <asm/setup.h>
 

diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h
index 27e420e302d8e64b8d1ffaf3368c0ebe33d7cbb1..088f77eed5e542d81bc78beb9859d4288028387d 100644 (file)
--- a/xen/include/xen/mm.h
+++ b/xen/include/xen/mm.h
@@ -587,10 +587,6 @@ void destroy_ring_for_helper(void **_va, struct page_info *page);
 /* Return the upper bound of MFNs, including hotplug memory. */
 unsigned long get_upper_mfn_bound(void);
 
-#if defined(CONFIG_X86)
-#include <asm/flushtlb.h>
-#endif
-
 enum XENSHARE_flags {
     SHARE_rw,
     SHARE_ro,