From e1271802210b57648146bd7fd515e40a30e58951 Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir@xen.org>
Date: Fri, 23 Mar 2012 13:55:40 +0000
Subject: vMSI: fix ia64 build for 21577:c41ab909f08e

On ia64, 21577:c41ab909f08e introduces the following error:
  /xen/include/xen/pci.h:52: warning: implicit declaration of function
  `PFN_UP'
  /xen/include/xen/pci.h:52: error: variable-size type declared
  outside of any function
  /xen/include/xen/pci.h:53: error: variable-size type declared
  outside of any function

Because the macro PFN_UP() is defined on x86 only.

Signed-off-by: Keir Fraser <keir@xen.org>
Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
xen-unstable changeset:   23074:c80e0fb4fe93
xen-unstable date:        Wed Mar 23 13:34:55 2011 +0000
---
 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  | 3 ---
 xen/include/xen/pci.h       | 1 +
 xen/include/xen/pfn.h       | 9 +++++++++
 11 files changed, 18 insertions(+), 3 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 ec2c7a9970..cf2a2348a0 100644
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -20,6 +20,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 a9276cd17c..4ab7e39e6d 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 3d61bb4599..02c011986e 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 89adbeb3f6..c04883e774 100644
--- a/xen/arch/x86/msi.c
+++ b/xen/arch/x86/msi.c
@@ -17,6 +17,7 @@
 #include <xen/pci.h>
 #include <xen/pci_regs.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 3101981f7c..0fc8ed3e3f 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 c34b680dfd..8649a8c810 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -20,6 +20,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 5caeb6a683..40ddfa9add 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 5e50bfc4e0..6743c6aefb 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 a94feac127..552815243c 100644
--- a/xen/include/asm-x86/page.h
+++ b/xen/include/asm-x86/page.h
@@ -385,9 +385,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)
-
 #endif /* __X86_PAGE_H__ */
 
 /*
diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h
index 634ed106d8..4edb9e0334 100644
--- a/xen/include/xen/pci.h
+++ b/xen/include/xen/pci.h
@@ -12,6 +12,7 @@
 #include <xen/list.h>
 #include <xen/spinlock.h>
 #include <xen/pci_regs.h>
+#include <xen/pfn.h>
 #include <asm/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__ */
-- 
cgit v1.2.3