[Xen-changelog] [xen-4.0-testing] vMSI: fix ia64 build for 21577:c41ab909f08e

[Xen patchbot-4.0-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1332510940 0
# Node ID 7d704b95c0ef2b42632f04b9bad40db164318ac4
# Parent  85312f3875b6a286759c441f394b0e28ad16723f
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@xxxxxxx>
Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
xen-unstable changeset:   23074:c80e0fb4fe93
xen-unstable date:        Wed Mar 23 13:34:55 2011 +0000
---


diff -r 85312f3875b6 -r 7d704b95c0ef xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c       Fri Mar 23 13:54:02 2012 +0000
+++ b/xen/arch/x86/domain_build.c       Fri Mar 23 13:55:40 2012 +0000
@@ -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 -r 85312f3875b6 -r 7d704b95c0ef xen/arch/x86/e820.c
--- a/xen/arch/x86/e820.c       Fri Mar 23 13:54:02 2012 +0000
+++ b/xen/arch/x86/e820.c       Fri Mar 23 13:55:40 2012 +0000
@@ -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 -r 85312f3875b6 -r 7d704b95c0ef xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Fri Mar 23 13:54:02 2012 +0000
+++ b/xen/arch/x86/mm.c Fri Mar 23 13:55:40 2012 +0000
@@ -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 -r 85312f3875b6 -r 7d704b95c0ef xen/arch/x86/msi.c
--- a/xen/arch/x86/msi.c        Fri Mar 23 13:54:02 2012 +0000
+++ b/xen/arch/x86/msi.c        Fri Mar 23 13:55:40 2012 +0000
@@ -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 -r 85312f3875b6 -r 7d704b95c0ef xen/arch/x86/numa.c
--- a/xen/arch/x86/numa.c       Fri Mar 23 13:54:02 2012 +0000
+++ b/xen/arch/x86/numa.c       Fri Mar 23 13:55:40 2012 +0000
@@ -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 -r 85312f3875b6 -r 7d704b95c0ef xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c      Fri Mar 23 13:54:02 2012 +0000
+++ b/xen/arch/x86/setup.c      Fri Mar 23 13:55:40 2012 +0000
@@ -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 -r 85312f3875b6 -r 7d704b95c0ef xen/arch/x86/srat.c
--- a/xen/arch/x86/srat.c       Fri Mar 23 13:54:02 2012 +0000
+++ b/xen/arch/x86/srat.c       Fri Mar 23 13:55:40 2012 +0000
@@ -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 -r 85312f3875b6 -r 7d704b95c0ef xen/arch/x86/tboot.c
--- a/xen/arch/x86/tboot.c      Fri Mar 23 13:54:02 2012 +0000
+++ b/xen/arch/x86/tboot.c      Fri Mar 23 13:55:40 2012 +0000
@@ -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 -r 85312f3875b6 -r 7d704b95c0ef xen/include/asm-x86/page.h
--- a/xen/include/asm-x86/page.h        Fri Mar 23 13:54:02 2012 +0000
+++ b/xen/include/asm-x86/page.h        Fri Mar 23 13:55:40 2012 +0000
@@ -385,9 +385,6 @@
 
 #endif /* !__ASSEMBLY__ */
 
-#define PFN_DOWN(x)   ((x) >> PAGE_SHIFT)
-#define PFN_UP(x)     (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
-
 #endif /* __X86_PAGE_H__ */
 
 /*
diff -r 85312f3875b6 -r 7d704b95c0ef xen/include/xen/pci.h
--- a/xen/include/xen/pci.h     Fri Mar 23 13:54:02 2012 +0000
+++ b/xen/include/xen/pci.h     Fri Mar 23 13:55:40 2012 +0000
@@ -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 -r 85312f3875b6 -r 7d704b95c0ef xen/include/xen/pfn.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/xen/include/xen/pfn.h     Fri Mar 23 13:55:40 2012 +0000
@@ -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__ */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog