ia64/xen-unstable

changeset 11048:d42e9a6f5378

[IA64] makes some includes explicit

Make some includes explicit.
Do not compile anymore vmx/mm.c: not used.

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>
author awilliam@xenbuild.aw
date Fri Aug 18 15:01:04 2006 -0600 (2006-08-18)
parents 493bb0265c12
children 37b25baa3a75
files xen/arch/ia64/linux-xen/iosapic.c xen/arch/ia64/linux-xen/irq_ia64.c xen/arch/ia64/linux-xen/mca.c xen/arch/ia64/linux-xen/process-linux-xen.c xen/arch/ia64/linux-xen/smp.c xen/arch/ia64/linux-xen/unwind.c xen/arch/ia64/vmx/Makefile xen/arch/ia64/vmx/mmio.c xen/arch/ia64/vmx/vmmu.c xen/arch/ia64/vmx/vtlb.c xen/arch/ia64/xen/acpi.c xen/arch/ia64/xen/dom0_ops.c xen/arch/ia64/xen/dom_fw.c xen/arch/ia64/xen/faults.c xen/arch/ia64/xen/fw_emul.c xen/arch/ia64/xen/hypercall.c xen/arch/ia64/xen/irq.c xen/arch/ia64/xen/mm.c xen/arch/ia64/xen/pcdp.c xen/arch/ia64/xen/privop.c xen/arch/ia64/xen/vcpu.c xen/include/asm-ia64/multicall.h
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/iosapic.c	Fri Aug 18 13:34:25 2006 -0600
     1.2 +++ b/xen/arch/ia64/linux-xen/iosapic.c	Fri Aug 18 15:01:04 2006 -0600
     1.3 @@ -77,6 +77,8 @@
     1.4  #include <linux/list.h>
     1.5  #ifndef XEN
     1.6  #include <linux/pci.h>
     1.7 +#else
     1.8 +#include <xen/errno.h>
     1.9  #endif
    1.10  #include <linux/smp.h>
    1.11  #include <linux/smp_lock.h>
     2.1 --- a/xen/arch/ia64/linux-xen/irq_ia64.c	Fri Aug 18 13:34:25 2006 -0600
     2.2 +++ b/xen/arch/ia64/linux-xen/irq_ia64.c	Fri Aug 18 15:01:04 2006 -0600
     2.3 @@ -40,6 +40,10 @@
     2.4  #include <asm/pgtable.h>
     2.5  #include <asm/system.h>
     2.6  
     2.7 +#ifdef XEN
     2.8 +#include <xen/perfc.h>
     2.9 +#endif
    2.10 +
    2.11  #ifdef CONFIG_PERFMON
    2.12  # include <asm/perfmon.h>
    2.13  #endif
     3.1 --- a/xen/arch/ia64/linux-xen/mca.c	Fri Aug 18 13:34:25 2006 -0600
     3.2 +++ b/xen/arch/ia64/linux-xen/mca.c	Fri Aug 18 15:01:04 2006 -0600
     3.3 @@ -79,6 +79,7 @@
     3.4  
     3.5  #ifdef XEN
     3.6  #include <xen/symbols.h>
     3.7 +#include <xen/mm.h>
     3.8  #endif
     3.9  
    3.10  #if defined(IA64_MCA_DEBUG_INFO)
     4.1 --- a/xen/arch/ia64/linux-xen/process-linux-xen.c	Fri Aug 18 13:34:25 2006 -0600
     4.2 +++ b/xen/arch/ia64/linux-xen/process-linux-xen.c	Fri Aug 18 15:01:04 2006 -0600
     4.3 @@ -10,6 +10,7 @@
     4.4  #include <xen/lib.h>
     4.5  #include <xen/symbols.h>
     4.6  #include <xen/smp.h>
     4.7 +#include <xen/sched.h>
     4.8  #include <asm/uaccess.h>
     4.9  #include <asm/processor.h>
    4.10  #include <asm/ptrace.h>
    4.11 @@ -166,6 +167,7 @@ show_regs (struct pt_regs *regs)
    4.12  	printk("r26 : %016lx r27 : %016lx r28 : %016lx\n", regs->r26, regs->r27, regs->r28);
    4.13  	printk("r29 : %016lx r30 : %016lx r31 : %016lx\n", regs->r29, regs->r30, regs->r31);
    4.14  
    4.15 +#ifndef XEN
    4.16  	if (user_mode(regs)) {
    4.17  		/* print the stacked registers */
    4.18  		unsigned long val, *bsp, ndirty;
    4.19 @@ -180,6 +182,7 @@ show_regs (struct pt_regs *regs)
    4.20  			       ((i == sof - 1) || (i % 3) == 2) ? "\n" : " ");
    4.21  		}
    4.22  	} else
    4.23 +#endif
    4.24  		show_stack(NULL, NULL);
    4.25  }
    4.26  
     5.1 --- a/xen/arch/ia64/linux-xen/smp.c	Fri Aug 18 13:34:25 2006 -0600
     5.2 +++ b/xen/arch/ia64/linux-xen/smp.c	Fri Aug 18 15:01:04 2006 -0600
     5.3 @@ -48,6 +48,7 @@
     5.4  #include <asm/unistd.h>
     5.5  #include <asm/mca.h>
     5.6  #ifdef XEN
     5.7 +#include <xen/errno.h>
     5.8  #include <asm/vhpt.h>
     5.9  #include <asm/hw_irq.h>
    5.10  #endif
     6.1 --- a/xen/arch/ia64/linux-xen/unwind.c	Fri Aug 18 13:34:25 2006 -0600
     6.2 +++ b/xen/arch/ia64/linux-xen/unwind.c	Fri Aug 18 15:01:04 2006 -0600
     6.3 @@ -33,6 +33,7 @@
     6.4  #include <xen/sched.h>
     6.5  #include <xen/xmalloc.h>
     6.6  #include <xen/spinlock.h>
     6.7 +#include <xen/errno.h>
     6.8  
     6.9  // work around
    6.10  #ifdef CONFIG_SMP
    6.11 @@ -2315,6 +2316,7 @@ unw_init (void)
    6.12  			  __start_unwind, __end_unwind);
    6.13  }
    6.14  
    6.15 +#ifndef XEN
    6.16  /*
    6.17   * DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED
    6.18   *
    6.19 @@ -2353,3 +2355,4 @@ sys_getunwind (void __user *buf, size_t 
    6.20  			return -EFAULT;
    6.21  	return unw.gate_table_size;
    6.22  }
    6.23 +#endif
     7.1 --- a/xen/arch/ia64/vmx/Makefile	Fri Aug 18 13:34:25 2006 -0600
     7.2 +++ b/xen/arch/ia64/vmx/Makefile	Fri Aug 18 15:01:04 2006 -0600
     7.3 @@ -1,5 +1,5 @@
     7.4  obj-y += hvm_vioapic.o
     7.5 -obj-y += mm.o
     7.6 +#obj-y += mm.o
     7.7  obj-y += mmio.o
     7.8  obj-y += pal_emul.o
     7.9  obj-y += vlsapic.o
     8.1 --- a/xen/arch/ia64/vmx/mmio.c	Fri Aug 18 13:34:25 2006 -0600
     8.2 +++ b/xen/arch/ia64/vmx/mmio.c	Fri Aug 18 15:01:04 2006 -0600
     8.3 @@ -22,6 +22,7 @@
     8.4   */
     8.5  
     8.6  #include <linux/sched.h>
     8.7 +#include <xen/mm.h>
     8.8  #include <asm/tlb.h>
     8.9  #include <asm/vmx_mm_def.h>
    8.10  #include <asm/gcc_intrin.h>
    8.11 @@ -30,7 +31,6 @@
    8.12  #include <asm/bundle.h>
    8.13  #include <asm/types.h>
    8.14  #include <public/hvm/ioreq.h>
    8.15 -#include <asm/mm.h>
    8.16  #include <asm/vmx.h>
    8.17  #include <public/event_channel.h>
    8.18  #include <public/arch-ia64.h>
     9.1 --- a/xen/arch/ia64/vmx/vmmu.c	Fri Aug 18 13:34:25 2006 -0600
     9.2 +++ b/xen/arch/ia64/vmx/vmmu.c	Fri Aug 18 15:01:04 2006 -0600
     9.3 @@ -33,6 +33,7 @@
     9.4  #include <asm/kregs.h>
     9.5  #include <asm/vcpu.h>
     9.6  #include <xen/irq.h>
     9.7 +#include <xen/errno.h>
     9.8  
     9.9  /*
    9.10   * Get the machine page frame number in 16KB unit
    10.1 --- a/xen/arch/ia64/vmx/vtlb.c	Fri Aug 18 13:34:25 2006 -0600
    10.2 +++ b/xen/arch/ia64/vmx/vtlb.c	Fri Aug 18 15:01:04 2006 -0600
    10.3 @@ -23,7 +23,7 @@
    10.4  
    10.5  #include <linux/sched.h>
    10.6  #include <asm/tlb.h>
    10.7 -#include <asm/mm.h>
    10.8 +#include <xen/mm.h>
    10.9  #include <asm/vmx_mm_def.h>
   10.10  #include <asm/gcc_intrin.h>
   10.11  #include <linux/interrupt.h>
    11.1 --- a/xen/arch/ia64/xen/acpi.c	Fri Aug 18 13:34:25 2006 -0600
    11.2 +++ b/xen/arch/ia64/xen/acpi.c	Fri Aug 18 15:01:04 2006 -0600
    11.3 @@ -51,6 +51,9 @@
    11.4  #include <asm/numa.h>
    11.5  #include <asm/sal.h>
    11.6  #include <asm/hw_irq.h>
    11.7 +#ifdef XEN
    11.8 +#include <xen/errno.h>
    11.9 +#endif
   11.10  
   11.11  #define BAD_MADT_ENTRY(entry, end) (                                        \
   11.12  		(!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
    12.1 --- a/xen/arch/ia64/xen/dom0_ops.c	Fri Aug 18 13:34:25 2006 -0600
    12.2 +++ b/xen/arch/ia64/xen/dom0_ops.c	Fri Aug 18 15:01:04 2006 -0600
    12.3 @@ -21,6 +21,7 @@
    12.4  #include <asm/vmx.h>
    12.5  #include <asm/dom_fw.h>
    12.6  #include <xen/iocap.h>
    12.7 +#include <xen/errno.h>
    12.8  
    12.9  void build_physmap_table(struct domain *d);
   12.10  
    13.1 --- a/xen/arch/ia64/xen/dom_fw.c	Fri Aug 18 13:34:25 2006 -0600
    13.2 +++ b/xen/arch/ia64/xen/dom_fw.c	Fri Aug 18 15:01:04 2006 -0600
    13.3 @@ -21,6 +21,7 @@
    13.4  #include <asm/fpswa.h>
    13.5  #include <xen/version.h>
    13.6  #include <xen/acpi.h>
    13.7 +#include <xen/errno.h>
    13.8  
    13.9  #include <asm/dom_fw.h>
   13.10  #include <asm/bundle.h>
    14.1 --- a/xen/arch/ia64/xen/faults.c	Fri Aug 18 13:34:25 2006 -0600
    14.2 +++ b/xen/arch/ia64/xen/faults.c	Fri Aug 18 15:01:04 2006 -0600
    14.3 @@ -13,6 +13,8 @@
    14.4  #include <xen/smp.h>
    14.5  #include <asm/ptrace.h>
    14.6  #include <xen/delay.h>
    14.7 +#include <xen/perfc.h>
    14.8 +#include <xen/mm.h>
    14.9  
   14.10  #include <asm/system.h>
   14.11  #include <asm/processor.h>
   14.12 @@ -28,6 +30,7 @@
   14.13  #include <asm/bundle.h>
   14.14  #include <asm/asm-xsi-offsets.h>
   14.15  #include <asm/shadow.h>
   14.16 +#include <asm/uaccess.h>
   14.17  
   14.18  extern void die_if_kernel(char *str, struct pt_regs *regs, long err);
   14.19  /* FIXME: where these declarations shold be there ? */
    15.1 --- a/xen/arch/ia64/xen/fw_emul.c	Fri Aug 18 13:34:25 2006 -0600
    15.2 +++ b/xen/arch/ia64/xen/fw_emul.c	Fri Aug 18 15:01:04 2006 -0600
    15.3 @@ -28,6 +28,7 @@
    15.4  #include "hpsim_ssc.h"
    15.5  #include <asm/vcpu.h>
    15.6  #include <asm/dom_fw.h>
    15.7 +#include <asm/uaccess.h>
    15.8  
    15.9  extern unsigned long running_on_sim;
   15.10  
    16.1 --- a/xen/arch/ia64/xen/hypercall.c	Fri Aug 18 13:34:25 2006 -0600
    16.2 +++ b/xen/arch/ia64/xen/hypercall.c	Fri Aug 18 15:01:04 2006 -0600
    16.3 @@ -11,6 +11,7 @@
    16.4  #include <xen/hypercall.h>
    16.5  #include <xen/multicall.h>
    16.6  #include <xen/guest_access.h>
    16.7 +#include <xen/mm.h>
    16.8  
    16.9  #include <linux/efi.h>	/* FOR EFI_UNIMPLEMENTED */
   16.10  #include <asm/sal.h>	/* FOR struct ia64_sal_retval */
    17.1 --- a/xen/arch/ia64/xen/irq.c	Fri Aug 18 13:34:25 2006 -0600
    17.2 +++ b/xen/arch/ia64/xen/irq.c	Fri Aug 18 15:01:04 2006 -0600
    17.3 @@ -40,7 +40,6 @@
    17.4  #include <asm/smp.h>
    17.5  #include <asm/system.h>
    17.6  #include <asm/bitops.h>
    17.7 -#include <asm/uaccess.h>
    17.8  #include <asm/pgalloc.h>
    17.9  #include <asm/delay.h>
   17.10  #include <xen/irq.h>
    18.1 --- a/xen/arch/ia64/xen/mm.c	Fri Aug 18 13:34:25 2006 -0600
    18.2 +++ b/xen/arch/ia64/xen/mm.c	Fri Aug 18 15:01:04 2006 -0600
    18.3 @@ -166,7 +166,8 @@
    18.4  #include <xen/sched.h>
    18.5  #include <xen/domain.h>
    18.6  #include <asm/xentypes.h>
    18.7 -#include <asm/mm.h>
    18.8 +#include <xen/mm.h>
    18.9 +#include <xen/errno.h>
   18.10  #include <asm/pgalloc.h>
   18.11  #include <asm/vhpt.h>
   18.12  #include <asm/vcpu.h>
    19.1 --- a/xen/arch/ia64/xen/pcdp.c	Fri Aug 18 13:34:25 2006 -0600
    19.2 +++ b/xen/arch/ia64/xen/pcdp.c	Fri Aug 18 15:01:04 2006 -0600
    19.3 @@ -18,6 +18,7 @@
    19.4  #ifdef XEN
    19.5  #include <linux/efi.h>
    19.6  #include <linux/errno.h>
    19.7 +#include <asm/io.h>
    19.8  #include <asm/iosapic.h>
    19.9  #include <asm/system.h>
   19.10  #include <acpi/acpi.h>
    20.1 --- a/xen/arch/ia64/xen/privop.c	Fri Aug 18 13:34:25 2006 -0600
    20.2 +++ b/xen/arch/ia64/xen/privop.c	Fri Aug 18 15:01:04 2006 -0600
    20.3 @@ -13,6 +13,7 @@
    20.4  #include <asm/dom_fw.h>
    20.5  #include <asm/vhpt.h>
    20.6  #include <asm/bundle.h>
    20.7 +#include <xen/perfc.h>
    20.8  
    20.9  long priv_verbose=0;
   20.10  unsigned long privop_trace = 0;
    21.1 --- a/xen/arch/ia64/xen/vcpu.c	Fri Aug 18 13:34:25 2006 -0600
    21.2 +++ b/xen/arch/ia64/xen/vcpu.c	Fri Aug 18 15:01:04 2006 -0600
    21.3 @@ -8,6 +8,7 @@
    21.4  
    21.5  #include <linux/sched.h>
    21.6  #include <public/arch-ia64.h>
    21.7 +#include <xen/mm.h>
    21.8  #include <asm/ia64_int.h>
    21.9  #include <asm/vcpu.h>
   21.10  #include <asm/regionreg.h>
   21.11 @@ -22,6 +23,7 @@
   21.12  #include <asm/vmx_phy_mode.h>
   21.13  #include <asm/bundle.h>
   21.14  #include <asm/privop_stat.h>
   21.15 +#include <asm/uaccess.h>
   21.16  
   21.17  /* FIXME: where these declarations should be there ? */
   21.18  extern void getreg(unsigned long regnum, unsigned long *val, int *nat, struct pt_regs *regs);
    22.1 --- a/xen/include/asm-ia64/multicall.h	Fri Aug 18 13:34:25 2006 -0600
    22.2 +++ b/xen/include/asm-ia64/multicall.h	Fri Aug 18 15:01:04 2006 -0600
    22.3 @@ -2,6 +2,7 @@
    22.4  #define __ASM_IA64_MULTICALL_H__
    22.5  
    22.6  #include <public/xen.h>
    22.7 +#include <xen/errno.h>
    22.8  
    22.9  typedef unsigned long (*hypercall_t)(
   22.10  			unsigned long arg0,