[PATCH] ia64 build fix

[PATCH] ia64 build fix

[Alex Williamson]

   Looks like cset 8863 included a header in xenbus.h that makes the
ia64 build unhappy.  domid_t isn't define so we blow up including
grant_table.h.  Fix below.  Thanks,

	Alex

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r 3ed537add538 linux-2.6-xen-sparse/include/xen/xenbus.h
--- a/linux-2.6-xen-sparse/include/xen/xenbus.h Fri Feb 17 21:26:49 2006 +0100
+++ b/linux-2.6-xen-sparse/include/xen/xenbus.h Fri Feb 17 17:05:38 2006 -0700
@@ -34,6 +34,7 @@
 #include <linux/device.h>
 #include <linux/notifier.h>
 #include <asm/semaphore.h>
+#include <xen/interface/xen.h>
 #include <xen/interface/grant_table.h>
 #include <xen/interface/io/xenbus.h>
 #include <xen/interface/io/xs_wire.h>

[PATCH] ia64 build fix

[Alex Williamson]

Keir,

   The patch below is needed to build ia64 on current xen-unstable.
Please apply.  BTW, the new mmap'ing of the kva page through the /proc
entry does seem to avoid the problem we were having with kmem on ia64.
Thanks,

	Alex


Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r 64f11b0e2e7d xen/include/xen/console.h
--- a/xen/include/xen/console.h	Sat Mar  4 19:16:36 2006 +0100
+++ b/xen/include/xen/console.h	Sun Mar  5 10:32:10 2006 -0700
@@ -8,6 +8,7 @@
 #define __CONSOLE_H__
 
 #include <xen/spinlock.h>
+#include <xen/guest_access.h>
 
 extern spinlock_t console_lock;

[PATCH] ia64 build fix

[Alex Williamson]

Hi Keir,

   The patch below fixes the ia64 build after cset10660.  Please apply.
Thanks,

	Alex

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r b20580cf7fc1 xen/common/trace.c
--- a/xen/common/trace.c	Wed Jul 12 16:34:39 2006 +0100
+++ b/xen/common/trace.c	Wed Jul 12 11:46:11 2006 -0600
@@ -30,6 +30,7 @@
 #include <xen/event.h>
 #include <xen/softirq.h>
 #include <xen/init.h>
+#include <xen/percpu.h>
 #include <asm/atomic.h>
 #include <public/dom0_ops.h>

[PATCH] ia64 build fix

[Alex Williamson]

Hi Keir,

   This patch gets ia64 building again on xen-unstable.hg due to the
addition of the uint64_t type in public/arch-ia64.h.  I also cleaned up
directly including this file versus public/xen.h as ia64 seems to be the
only arch using it directly.  Please apply.  Thanks,

	Alex

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r f328519053f5 xen/arch/ia64/vmx/mmio.c
--- a/xen/arch/ia64/vmx/mmio.c	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/vmx/mmio.c	Mon Aug 14 10:44:54 2006 -0600
@@ -33,7 +33,7 @@
 #include <asm/mm.h>
 #include <asm/vmx.h>
 #include <public/event_channel.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <linux/event.h>
 #include <xen/domain.h>
 /*
diff -r f328519053f5 xen/arch/ia64/vmx/vlsapic.c
--- a/xen/arch/ia64/vmx/vlsapic.c	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/vmx/vlsapic.c	Mon Aug 14 10:44:54 2006 -0600
@@ -21,7 +21,7 @@
  */
 
 #include <linux/sched.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/ia64_int.h>
 #include <asm/vcpu.h>
 #include <asm/regionreg.h>
diff -r f328519053f5 xen/arch/ia64/vmx/vmx_init.c
--- a/xen/arch/ia64/vmx/vmx_init.c	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/vmx/vmx_init.c	Mon Aug 14 10:44:54 2006 -0600
@@ -41,15 +41,14 @@
 #include <asm/vmx_vcpu.h>
 #include <xen/lib.h>
 #include <asm/vmmu.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <public/hvm/ioreq.h>
+#include <public/event_channel.h>
 #include <asm/vmx_phy_mode.h>
 #include <asm/processor.h>
 #include <asm/vmx.h>
 #include <xen/mm.h>
-#include <public/arch-ia64.h>
 #include <asm/hvm/vioapic.h>
-#include <public/event_channel.h>
 #include <xen/event.h>
 #include <asm/vlsapic.h>
 
diff -r f328519053f5 xen/arch/ia64/vmx/vmx_vcpu.c
--- a/xen/arch/ia64/vmx/vmx_vcpu.c	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/vmx/vmx_vcpu.c	Mon Aug 14 10:44:54 2006 -0600
@@ -24,7 +24,7 @@
  */
 
 #include <xen/sched.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/ia64_int.h>
 #include <asm/vmx_vcpu.h>
 #include <asm/regionreg.h>
diff -r f328519053f5 xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/xen/domain.c	Mon Aug 14 10:44:54 2006 -0600
@@ -35,14 +35,13 @@
 #include <asm/pgalloc.h>
 #include <asm/offsets.h>  /* for IA64_THREAD_INFO_SIZE */
 #include <asm/vcpu.h>   /* for function declarations */
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <xen/domain.h>
 #include <asm/vmx.h>
 #include <asm/vmx_vcpu.h>
 #include <asm/vmx_vpd.h>
 #include <asm/vmx_phy_mode.h>
 #include <asm/vhpt.h>
-#include <public/arch-ia64.h>
 #include <asm/tlbflush.h>
 #include <asm/regionreg.h>
 #include <asm/dom_fw.h>
diff -r f328519053f5 xen/arch/ia64/xen/hyperprivop.S
--- a/xen/arch/ia64/xen/hyperprivop.S	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/xen/hyperprivop.S	Mon Aug 14 10:44:54 2006 -0600
@@ -14,7 +14,7 @@
 #include <asm/system.h>
 #include <asm/debugger.h>
 #include <asm/asm-xsi-offsets.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 
 
 #define	_PAGE_PPN_MASK	0x0003fffffffff000 //asm/pgtable.h doesn't do assembly
diff -r f328519053f5 xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/xen/vcpu.c	Mon Aug 14 10:44:54 2006 -0600
@@ -7,7 +7,7 @@
  */
 
 #include <linux/sched.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/ia64_int.h>
 #include <asm/vcpu.h>
 #include <asm/regionreg.h>
diff -r f328519053f5 xen/arch/ia64/xen/xenasm.S
--- a/xen/arch/ia64/xen/xenasm.S	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/xen/xenasm.S	Mon Aug 14 10:44:54 2006 -0600
@@ -11,7 +11,7 @@
 #include <asm/pgtable.h>
 #include <asm/vhpt.h>
 #include <asm/asm-xsi-offsets.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 	
 // Change rr7 to the passed value while ensuring
 // Xen is mapped into the new region.
diff -r f328519053f5 xen/include/asm-ia64/domain.h
--- a/xen/include/asm-ia64/domain.h	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/include/asm-ia64/domain.h	Mon Aug 14 10:44:54 2006 -0600
@@ -6,7 +6,7 @@
 #include <asm/vmx_vpd.h>
 #include <asm/vmmu.h>
 #include <asm/regionreg.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/vmx_platform.h>
 #include <xen/list.h>
 #include <xen/cpumask.h>
diff -r f328519053f5 xen/include/asm-ia64/event.h
--- a/xen/include/asm-ia64/event.h	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/include/asm-ia64/event.h	Mon Aug 14 10:44:54 2006 -0600
@@ -9,7 +9,7 @@
 #ifndef __ASM_EVENT_H__
 #define __ASM_EVENT_H__
 
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/vcpu.h>
 
 static inline void vcpu_kick(struct vcpu *v)
diff -r f328519053f5 xen/include/asm-ia64/linux-xen/asm/ptrace.h
--- a/xen/include/asm-ia64/linux-xen/asm/ptrace.h	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/include/asm-ia64/linux-xen/asm/ptrace.h	Mon Aug 14 10:44:54 2006 -0600
@@ -96,7 +96,8 @@
  *
  */
 #ifdef XEN
-#include <public/arch-ia64.h>
+#include <xen/types.h>
+#include <public/xen.h>
 #define pt_regs cpu_user_regs
 
 /*  User regs at placed at the end of the vcpu area.
diff -r f328519053f5 xen/include/asm-ia64/privop_stat.h
--- a/xen/include/asm-ia64/privop_stat.h	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/include/asm-ia64/privop_stat.h	Mon Aug 14 10:44:54 2006 -0600
@@ -1,6 +1,7 @@
 #ifndef _XEN_UA64_PRIVOP_STAT_H
 #define _XEN_UA64_PRIVOP_STAT_H
-#include <public/arch-ia64.h>
+#include <xen/types.h>
+#include <public/xen.h>
 
 extern int dump_privop_counts_to_user(char *, int);
 extern int zero_privop_counts_to_user(char *, int);
diff -r f328519053f5 xen/include/asm-ia64/vcpu.h
--- a/xen/include/asm-ia64/vcpu.h	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/include/asm-ia64/vcpu.h	Mon Aug 14 10:44:54 2006 -0600
@@ -7,7 +7,8 @@
 #include <asm/fpu.h>
 #include <asm/tlb.h>
 #include <asm/ia64_int.h>
-#include <public/arch-ia64.h>
+#include <xen/types.h>
+#include <public/xen.h>
 typedef	unsigned long UINT64;
 typedef	unsigned int UINT;
 typedef	int BOOLEAN;
diff -r f328519053f5 xen/include/asm-ia64/vmx_platform.h
--- a/xen/include/asm-ia64/vmx_platform.h	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/include/asm-ia64/vmx_platform.h	Mon Aug 14 10:44:54 2006 -0600
@@ -21,7 +21,6 @@
 
 #include <public/xen.h>
 #include <public/hvm/params.h>
-#include <public/arch-ia64.h>
 #include <asm/hvm/vioapic.h>
 struct mmio_list;
 typedef struct virtual_platform_def {
diff -r f328519053f5 xen/include/asm-ia64/vmx_vpd.h
--- a/xen/include/asm-ia64/vmx_vpd.h	Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/include/asm-ia64/vmx_vpd.h	Mon Aug 14 10:44:54 2006 -0600
@@ -26,7 +26,7 @@
 
 #include <asm/vtm.h>
 #include <asm/vmx_platform.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 
 #define VPD_SHIFT	17	/* 128K requirement */
 #define VPD_SIZE	(1 << VPD_SHIFT)

[PATCH] ia64 build fix

[Alex Williamson]

Hi Keir,

   Changeset 16067:9f9f9b68cd08 breaks all non-x86 archs.  Here's a
patch that gets things to a working state on ia64.  Thanks,

	Alex


[IA64] Update for cset 16067:9f9f9b68cd08

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r a1d0a272c890 xen/arch/ia64/xen/mm.c
--- a/xen/arch/ia64/xen/mm.c	Fri Oct 05 14:39:40 2007 +0100
+++ b/xen/arch/ia64/xen/mm.c	Fri Oct 05 10:43:20 2007 -0600
@@ -2893,6 +2893,13 @@ arch_memory_op(int op, XEN_GUEST_HANDLE(
     return 0;
 }
 
+int
+iomem_page_test(unsigned long mfn, struct page_info *page)
+{
+	return unlikely(!mfn_valid(mfn)) ||
+	       unlikely(page_get_owner(page) == dom_io);
+}
+
 /*
  * Local variables:
  * mode: C
diff -r a1d0a272c890 xen/include/asm-ia64/mm.h
--- a/xen/include/asm-ia64/mm.h	Fri Oct 05 14:39:40 2007 +0100
+++ b/xen/include/asm-ia64/mm.h	Fri Oct 05 10:41:55 2007 -0600
@@ -184,6 +184,9 @@ static inline int get_page(struct page_i
     while(unlikely((y = cmpxchg_acq((u64*)&page->count_info, x, nx)) != x));
     return 1;
 }
+
+/* Decide whether this page looks like iomem or real memory */
+int iomem_page_test(unsigned long mfn, struct page_info *page);
 
 extern void put_page_type(struct page_info *page);
 extern int get_page_type(struct page_info *page, u32 type);