Define new <pfn.h> header for PFN_{DOWN,UP} macros.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index 63adfa7d24487a8ec35031acf823edd423ba290f..47cca8ce2a037c12b07cddedfbd0074766dc99d6 100644 (file)
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -21,6 +21,7 @@
 #include <xen/bitops.h>
 #include <xen/compat.h>
 #include <xen/libelf.h>
+#include <xen/pfn.h>
 #include <asm/regs.h>
 #include <asm/system.h>
 #include <asm/io.h>

diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c
index 6a3903f4c3f38bca468068985978579d92f8f0f9..a29a153c545ad2360b566ec1da730149ee3dccd9 100644 (file)
--- a/xen/arch/x86/e820.c
+++ b/xen/arch/x86/e820.c
@@ -4,6 +4,7 @@
 #include <xen/mm.h>
 #include <xen/compat.h>
 #include <xen/dmi.h>
+#include <xen/pfn.h>
 #include <asm/e820.h>
 #include <asm/page.h>
 #include <asm/processor.h>

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 3a484fd4da4b0224eb67f958399d182b1a6daafd..4f473d40052f514368c4719cc5bea551cf7bf3cd 100644 (file)
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -99,6 +99,7 @@
 #include <xen/event.h>
 #include <xen/iocap.h>
 #include <xen/guest_access.h>
+#include <xen/pfn.h>
 #include <asm/paging.h>
 #include <asm/shadow.h>
 #include <asm/page.h>

diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c
index 81beb290ed53b63554aa7065600f1a0cc856c75b..9ea4f87879e4440baf4d1b64daca7e578ff7a592 100644 (file)
--- a/xen/arch/x86/msi.c
+++ b/xen/arch/x86/msi.c
@@ -18,6 +18,7 @@
 #include <xen/pci_regs.h>
 #include <xen/iocap.h>
 #include <xen/keyhandler.h>
+#include <xen/pfn.h>
 #include <asm/io.h>
 #include <asm/smp.h>
 #include <asm/desc.h>

diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c
index 021619bf9d154ae810f40787e0202505124abfc6..19cb8df942bda752d1032062b5ed2e9175bb49a1 100644 (file)
--- a/xen/arch/x86/numa.c
+++ b/xen/arch/x86/numa.c
@@ -13,6 +13,7 @@
 #include <xen/keyhandler.h>
 #include <xen/time.h>
 #include <xen/smp.h>
+#include <xen/pfn.h>
 #include <asm/acpi.h>
 #include <xen/sched.h>
 

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 77b3c1bfe7d06631ceb7c3b2ace39ee6020a8fb2..5734782d76ac82602a6990b4b9ec5d6288ad1bd2 100644 (file)
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -21,6 +21,7 @@
 #include <xen/rcupdate.h>
 #include <xen/vga.h>
 #include <xen/dmi.h>
+#include <xen/pfn.h>
 #include <xen/nodemask.h>
 #include <public/version.h>
 #ifdef CONFIG_COMPAT

diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c
index 63b8c2137df993e58fe21d17753aa42aade7da12..bc857d5b29ebe1f713d5d8a25ce6d969c9aeb7de 100644 (file)
--- a/xen/arch/x86/srat.c
+++ b/xen/arch/x86/srat.c
@@ -17,6 +17,7 @@
 #include <xen/nodemask.h>
 #include <xen/acpi.h>
 #include <xen/numa.h>
+#include <xen/pfn.h>
 #include <asm/e820.h>
 #include <asm/page.h>
 

diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c
index 42158741c1fc5ed2b91ac3a79d4b915ec3263c35..0fa4eef75d532abdb7943267f14a89cc0eb7ee9e 100644 (file)
--- a/xen/arch/x86/tboot.c
+++ b/xen/arch/x86/tboot.c
@@ -6,6 +6,7 @@
 #include <xen/domain_page.h>
 #include <xen/iommu.h>
 #include <xen/acpi.h>
+#include <xen/pfn.h>
 #include <asm/fixmap.h>
 #include <asm/page.h>
 #include <asm/processor.h>

diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h
index fa54c5727b99fd7e44e3ed3e4134b8fdf3b9d449..68b040c8dcdea7fff9bda1e1af8e5d10db49aa6f 100644 (file)
--- a/xen/include/asm-x86/page.h
+++ b/xen/include/asm-x86/page.h
@@ -396,8 +396,6 @@ static inline uint32_t cacheattr_to_pte_flags(uint32_t cacheattr)
 
 #endif /* !__ASSEMBLY__ */
 
-#define PFN_DOWN(x)   ((x) >> PAGE_SHIFT)
-#define PFN_UP(x)     (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
 #define PAGE_ALIGN(x) (((x) + PAGE_SIZE - 1) & PAGE_MASK)
 
 #endif /* __X86_PAGE_H__ */

diff --git a/xen/include/xen/pfn.h b/xen/include/xen/pfn.h
new file mode 100644 (file)
index 0000000..3626197
--- /dev/null
+++ b/xen/include/xen/pfn.h
@@ -0,0 +1,9 @@
+#ifndef __XEN_PFN_H__
+#define __XEN_PFN_H__
+
+#include <asm/page.h>
+
+#define PFN_DOWN(x)   ((x) >> PAGE_SHIFT)
+#define PFN_UP(x)     (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
+
+#endif /* __XEN_PFN_H__ */