From 1ab2732dd07007b64250ad42794f1c79cf02d8a7 Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir@xen.org>
Date: Wed, 23 Mar 2011 13:34:55 +0000
Subject: [PATCH] Define new <pfn.h> header for PFN_{DOWN,UP} macros.

Signed-off-by: Keir Fraser <keir@xen.org>
---
 xen/arch/x86/domain_build.c | 1 +
 xen/arch/x86/e820.c         | 1 +
 xen/arch/x86/mm.c           | 1 +
 xen/arch/x86/msi.c          | 1 +
 xen/arch/x86/numa.c         | 1 +
 xen/arch/x86/setup.c        | 1 +
 xen/arch/x86/srat.c         | 1 +
 xen/arch/x86/tboot.c        | 1 +
 xen/include/asm-x86/page.h  | 2 --
 xen/include/xen/pfn.h       | 9 +++++++++
 10 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 xen/include/xen/pfn.h

diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index 63adfa7d24..47cca8ce2a 100644
--- 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 6a3903f4c3..a29a153c54 100644
--- 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 3a484fd4da..4f473d4005 100644
--- 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 81beb290ed..9ea4f87879 100644
--- 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 021619bf9d..19cb8df942 100644
--- 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 77b3c1bfe7..5734782d76 100644
--- 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 63b8c2137d..bc857d5b29 100644
--- 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 42158741c1..0fa4eef75d 100644
--- 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 fa54c5727b..68b040c8dc 100644
--- 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
index 0000000000..3626197de3
--- /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__ */
-- 
2.39.5