direct-io.hg

changeset 15301:1d74c51c2d5a

[IA64] memmap: preliminary header file clean up

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author Alex Williamson <alex.williamson@hp.com>
date Mon May 21 13:55:58 2007 -0600 (2007-05-21)
parents f8b0d7a46b4d
children 0dc47397aad8
files xen/include/asm-ia64/bundle.h xen/include/asm-ia64/dom_fw.h xen/include/asm-ia64/domain.h xen/include/public/arch-ia64.h
line diff
     1.1 --- a/xen/include/asm-ia64/bundle.h	Mon May 21 13:54:39 2007 -0600
     1.2 +++ b/xen/include/asm-ia64/bundle.h	Mon May 21 13:55:58 2007 -0600
     1.3 @@ -223,8 +223,10 @@ typedef union U_INST64 {
     1.4      INST64_M47 M47;	// purge translation entry
     1.5  } INST64;
     1.6  
     1.7 +#ifdef __XEN__
     1.8  extern unsigned long __vmx_get_domain_bundle(unsigned long iip, IA64_BUNDLE *pbundle);
     1.9  extern IA64_BUNDLE __get_domain_bundle(unsigned long iip);
    1.10 +#endif
    1.11  
    1.12  #define MASK_41 ((unsigned long)0x1ffffffffff)
    1.13  
     2.1 --- a/xen/include/asm-ia64/dom_fw.h	Mon May 21 13:54:39 2007 -0600
     2.2 +++ b/xen/include/asm-ia64/dom_fw.h	Mon May 21 13:55:58 2007 -0600
     2.3 @@ -5,8 +5,6 @@
     2.4   *	Dan Magenheimer (dan.magenheimer@hp.com)
     2.5   */
     2.6  
     2.7 -#include <linux/efi.h>
     2.8 -
     2.9  /* Portion of guest physical memory space reserved for PAL/SAL/EFI/ACPI
    2.10     data and code.  */
    2.11  #define FW_BASE_PADDR		0x0000UL
    2.12 @@ -184,9 +182,12 @@
    2.13  /* Additionnal OEM SAL.  */
    2.14  #define SAL_XEN_SAL_RETURN	0x02000000
    2.15  
    2.16 +#ifdef __XEN__
    2.17 +#include <linux/efi.h>
    2.18  extern struct ia64_pal_retval xen_pal_emulator(u64, u64, u64, u64);
    2.19  extern struct sal_ret_values sal_emulator (long index, unsigned long in1, unsigned long in2, unsigned long in3, unsigned long in4, unsigned long in5, unsigned long in6, unsigned long in7);
    2.20  extern struct ia64_pal_retval pal_emulator_static (unsigned long);
    2.21  extern efi_status_t efi_emulator (struct pt_regs *regs, unsigned long *fault);
    2.22  
    2.23  extern int dom_fw_setup (struct domain *, unsigned long bp_mpa, unsigned long maxmem);
    2.24 +#endif
     3.1 --- a/xen/include/asm-ia64/domain.h	Mon May 21 13:54:39 2007 -0600
     3.2 +++ b/xen/include/asm-ia64/domain.h	Mon May 21 13:55:58 2007 -0600
     3.3 @@ -208,10 +208,6 @@ struct arch_vcpu {
     3.4  #include <asm/uaccess.h> /* for KERNEL_DS */
     3.5  #include <asm/pgtable.h>
     3.6  
     3.7 -/* Guest physical address of IO ports space.  */
     3.8 -#define IO_PORTS_PADDR          0x00000ffffc000000UL
     3.9 -#define IO_PORTS_SIZE           0x0000000004000000UL
    3.10 -
    3.11  int
    3.12  do_perfmon_op(unsigned long cmd,
    3.13                XEN_GUEST_HANDLE(void) arg1, unsigned long arg2);
     4.1 --- a/xen/include/public/arch-ia64.h	Mon May 21 13:54:39 2007 -0600
     4.2 +++ b/xen/include/public/arch-ia64.h	Mon May 21 13:55:58 2007 -0600
     4.3 @@ -78,6 +78,10 @@ typedef unsigned long xen_ulong_t;
     4.4  #define MEM_G   (1UL << 30)
     4.5  #define MEM_M   (1UL << 20)
     4.6  
     4.7 +/* Guest physical address of IO ports space.  */
     4.8 +#define IO_PORTS_PADDR          0x00000ffffc000000UL
     4.9 +#define IO_PORTS_SIZE           0x0000000004000000UL
    4.10 +
    4.11  #define MMIO_START       (3 * MEM_G)
    4.12  #define MMIO_SIZE        (512 * MEM_M)
    4.13