# HG changeset patch
# User gingold@virtu10
# Node ID 1a542420ccf438ff3580ff0e95db6a86c31b707d
# Parent  9db43ac6485fac8ed65d8dff2e644c42033ebe72
Make some includes explicit.
Do not compile anymore vmx/mm.c: not used.

Signed-off-by: Tristan Gingold <tristan.gingold@xxxxxxxx>

diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/linux-xen/iosapic.c
--- a/xen/arch/ia64/linux-xen/iosapic.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/linux-xen/iosapic.c	Fri Aug 18 15:48:42 2006 +0200
@@ -77,6 +77,8 @@
 #include <linux/list.h>
 #ifndef XEN
 #include <linux/pci.h>
+#else
+#include <xen/errno.h>
 #endif
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/linux-xen/irq_ia64.c
--- a/xen/arch/ia64/linux-xen/irq_ia64.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/linux-xen/irq_ia64.c	Fri Aug 18 15:48:42 2006 +0200
@@ -40,6 +40,10 @@
 #include <asm/pgtable.h>
 #include <asm/system.h>
 
+#ifdef XEN
+#include <xen/perfc.h>
+#endif
+
 #ifdef CONFIG_PERFMON
 # include <asm/perfmon.h>
 #endif
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/linux-xen/mca.c
--- a/xen/arch/ia64/linux-xen/mca.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/linux-xen/mca.c	Fri Aug 18 15:48:42 2006 +0200
@@ -79,6 +79,7 @@
 
 #ifdef XEN
 #include <xen/symbols.h>
+#include <xen/mm.h>
 #endif
 
 #if defined(IA64_MCA_DEBUG_INFO)
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/linux-xen/process-linux-xen.c
--- a/xen/arch/ia64/linux-xen/process-linux-xen.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/linux-xen/process-linux-xen.c	Fri Aug 18 15:48:42 2006 +0200
@@ -10,6 +10,7 @@
 #include <xen/lib.h>
 #include <xen/symbols.h>
 #include <xen/smp.h>
+#include <xen/sched.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
@@ -166,6 +167,7 @@ show_regs (struct pt_regs *regs)
 	printk("r26 : %016lx r27 : %016lx r28 : %016lx\n", regs->r26, regs->r27, regs->r28);
 	printk("r29 : %016lx r30 : %016lx r31 : %016lx\n", regs->r29, regs->r30, regs->r31);
 
+#ifndef XEN
 	if (user_mode(regs)) {
 		/* print the stacked registers */
 		unsigned long val, *bsp, ndirty;
@@ -180,6 +182,7 @@ show_regs (struct pt_regs *regs)
 			       ((i == sof - 1) || (i % 3) == 2) ? "\n" : " ");
 		}
 	} else
+#endif
 		show_stack(NULL, NULL);
 }
 
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/linux-xen/smp.c
--- a/xen/arch/ia64/linux-xen/smp.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/linux-xen/smp.c	Fri Aug 18 15:48:42 2006 +0200
@@ -48,6 +48,7 @@
 #include <asm/unistd.h>
 #include <asm/mca.h>
 #ifdef XEN
+#include <xen/errno.h>
 #include <asm/vhpt.h>
 #include <asm/hw_irq.h>
 #endif
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/linux-xen/unwind.c
--- a/xen/arch/ia64/linux-xen/unwind.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/linux-xen/unwind.c	Fri Aug 18 15:48:42 2006 +0200
@@ -33,6 +33,7 @@
 #include <xen/sched.h>
 #include <xen/xmalloc.h>
 #include <xen/spinlock.h>
+#include <xen/errno.h>
 
 // work around
 #ifdef CONFIG_SMP
@@ -2315,6 +2316,7 @@ unw_init (void)
 			  __start_unwind, __end_unwind);
 }
 
+#ifndef XEN
 /*
  * DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED
  *
@@ -2353,3 +2355,4 @@ sys_getunwind (void __user *buf, size_t 
 			return -EFAULT;
 	return unw.gate_table_size;
 }
+#endif
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/vmx/Makefile
--- a/xen/arch/ia64/vmx/Makefile	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/vmx/Makefile	Fri Aug 18 15:48:42 2006 +0200
@@ -1,5 +1,5 @@ obj-y += hvm_vioapic.o
 obj-y += hvm_vioapic.o
-obj-y += mm.o
+#obj-y += mm.o
 obj-y += mmio.o
 obj-y += pal_emul.o
 obj-y += vlsapic.o
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/vmx/mmio.c
--- a/xen/arch/ia64/vmx/mmio.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/vmx/mmio.c	Fri Aug 18 15:48:42 2006 +0200
@@ -22,6 +22,7 @@
  */
 
 #include <linux/sched.h>
+#include <xen/mm.h>
 #include <asm/tlb.h>
 #include <asm/vmx_mm_def.h>
 #include <asm/gcc_intrin.h>
@@ -30,7 +31,6 @@
 #include <asm/bundle.h>
 #include <asm/types.h>
 #include <public/hvm/ioreq.h>
-#include <asm/mm.h>
 #include <asm/vmx.h>
 #include <public/event_channel.h>
 #include <public/arch-ia64.h>
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/vmx/vmmu.c
--- a/xen/arch/ia64/vmx/vmmu.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/vmx/vmmu.c	Fri Aug 18 15:48:42 2006 +0200
@@ -33,6 +33,7 @@
 #include <asm/kregs.h>
 #include <asm/vcpu.h>
 #include <xen/irq.h>
+#include <xen/errno.h>
 
 /*
  * Get the machine page frame number in 16KB unit
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/vmx/vtlb.c
--- a/xen/arch/ia64/vmx/vtlb.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/vmx/vtlb.c	Fri Aug 18 15:48:42 2006 +0200
@@ -23,7 +23,7 @@
 
 #include <linux/sched.h>
 #include <asm/tlb.h>
-#include <asm/mm.h>
+#include <xen/mm.h>
 #include <asm/vmx_mm_def.h>
 #include <asm/gcc_intrin.h>
 #include <linux/interrupt.h>
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/xen/acpi.c
--- a/xen/arch/ia64/xen/acpi.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/xen/acpi.c	Fri Aug 18 15:48:42 2006 +0200
@@ -51,6 +51,9 @@
 #include <asm/numa.h>
 #include <asm/sal.h>
 #include <asm/hw_irq.h>
+#ifdef XEN
+#include <xen/errno.h>
+#endif
 
 #define BAD_MADT_ENTRY(entry, end) (                                        \
 		(!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/xen/dom0_ops.c
--- a/xen/arch/ia64/xen/dom0_ops.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/xen/dom0_ops.c	Fri Aug 18 15:48:42 2006 +0200
@@ -21,6 +21,7 @@
 #include <asm/vmx.h>
 #include <asm/dom_fw.h>
 #include <xen/iocap.h>
+#include <xen/errno.h>
 
 void build_physmap_table(struct domain *d);
 
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/xen/dom_fw.c
--- a/xen/arch/ia64/xen/dom_fw.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/xen/dom_fw.c	Fri Aug 18 15:48:42 2006 +0200
@@ -21,6 +21,7 @@
 #include <asm/fpswa.h>
 #include <xen/version.h>
 #include <xen/acpi.h>
+#include <xen/errno.h>
 
 #include <asm/dom_fw.h>
 #include <asm/bundle.h>
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/xen/faults.c
--- a/xen/arch/ia64/xen/faults.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/xen/faults.c	Fri Aug 18 15:48:42 2006 +0200
@@ -13,6 +13,8 @@
 #include <xen/smp.h>
 #include <asm/ptrace.h>
 #include <xen/delay.h>
+#include <xen/perfc.h>
+#include <xen/mm.h>
 
 #include <asm/system.h>
 #include <asm/processor.h>
@@ -28,6 +30,7 @@
 #include <asm/bundle.h>
 #include <asm/asm-xsi-offsets.h>
 #include <asm/shadow.h>
+#include <asm/uaccess.h>
 
 extern void die_if_kernel(char *str, struct pt_regs *regs, long err);
 /* FIXME: where these declarations shold be there ? */
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/xen/fw_emul.c
--- a/xen/arch/ia64/xen/fw_emul.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/xen/fw_emul.c	Fri Aug 18 15:48:42 2006 +0200
@@ -28,6 +28,7 @@
 #include "hpsim_ssc.h"
 #include <asm/vcpu.h>
 #include <asm/dom_fw.h>
+#include <asm/uaccess.h>
 
 extern unsigned long running_on_sim;
 
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/xen/hypercall.c
--- a/xen/arch/ia64/xen/hypercall.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/xen/hypercall.c	Fri Aug 18 15:48:42 2006 +0200
@@ -11,6 +11,7 @@
 #include <xen/hypercall.h>
 #include <xen/multicall.h>
 #include <xen/guest_access.h>
+#include <xen/mm.h>
 
 #include <linux/efi.h>	/* FOR EFI_UNIMPLEMENTED */
 #include <asm/sal.h>	/* FOR struct ia64_sal_retval */
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/xen/irq.c
--- a/xen/arch/ia64/xen/irq.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/xen/irq.c	Fri Aug 18 15:48:42 2006 +0200
@@ -40,7 +40,6 @@
 #include <asm/smp.h>
 #include <asm/system.h>
 #include <asm/bitops.h>
-#include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/delay.h>
 #include <xen/irq.h>
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/xen/mm.c
--- a/xen/arch/ia64/xen/mm.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/xen/mm.c	Fri Aug 18 15:48:42 2006 +0200
@@ -166,7 +166,8 @@
 #include <xen/sched.h>
 #include <xen/domain.h>
 #include <asm/xentypes.h>
-#include <asm/mm.h>
+#include <xen/mm.h>
+#include <xen/errno.h>
 #include <asm/pgalloc.h>
 #include <asm/vhpt.h>
 #include <asm/vcpu.h>
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/xen/pcdp.c
--- a/xen/arch/ia64/xen/pcdp.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/xen/pcdp.c	Fri Aug 18 15:48:42 2006 +0200
@@ -18,6 +18,7 @@
 #ifdef XEN
 #include <linux/efi.h>
 #include <linux/errno.h>
+#include <asm/io.h>
 #include <asm/iosapic.h>
 #include <asm/system.h>
 #include <acpi/acpi.h>
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/xen/privop.c
--- a/xen/arch/ia64/xen/privop.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/xen/privop.c	Fri Aug 18 15:48:42 2006 +0200
@@ -13,6 +13,7 @@
 #include <asm/dom_fw.h>
 #include <asm/vhpt.h>
 #include <asm/bundle.h>
+#include <xen/perfc.h>
 
 long priv_verbose=0;
 unsigned long privop_trace = 0;
diff -r 9db43ac6485f -r 1a542420ccf4 xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/arch/ia64/xen/vcpu.c	Fri Aug 18 15:48:42 2006 +0200
@@ -8,6 +8,7 @@
 
 #include <linux/sched.h>
 #include <public/arch-ia64.h>
+#include <xen/mm.h>
 #include <asm/ia64_int.h>
 #include <asm/vcpu.h>
 #include <asm/regionreg.h>
@@ -22,6 +23,7 @@
 #include <asm/vmx_phy_mode.h>
 #include <asm/bundle.h>
 #include <asm/privop_stat.h>
+#include <asm/uaccess.h>
 
 /* FIXME: where these declarations should be there ? */
 extern void getreg(unsigned long regnum, unsigned long *val, int *nat, struct pt_regs *regs);
diff -r 9db43ac6485f -r 1a542420ccf4 xen/include/asm-ia64/domain.h
--- a/xen/include/asm-ia64/domain.h	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/include/asm-ia64/domain.h	Fri Aug 18 15:48:42 2006 +0200
@@ -204,7 +204,6 @@ struct arch_vcpu {
     int last_processor;
 };
 
-#include <asm/uaccess.h> /* for KERNEL_DS */
 #include <asm/pgtable.h>
 
 /* Guest physical address of IO ports space.  */
diff -r 9db43ac6485f -r 1a542420ccf4 xen/include/asm-ia64/multicall.h
--- a/xen/include/asm-ia64/multicall.h	Fri Aug 18 15:40:28 2006 +0200
+++ b/xen/include/asm-ia64/multicall.h	Fri Aug 18 15:48:42 2006 +0200
@@ -2,6 +2,7 @@
 #define __ASM_IA64_MULTICALL_H__
 
 #include <public/xen.h>
+#include <xen/errno.h>
 
 typedef unsigned long (*hypercall_t)(
 			unsigned long arg0,