ia64/linux-2.6.18-xen.hg

changeset 308:f539cd7c9331

[IA64] Sync arch-ia64.h with Xen

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author Alex Williamson <alex.williamson@hp.com>
date Wed Nov 07 15:19:39 2007 -0700 (2007-11-07)
parents 6db518f1a141
children cf8b6cafa2f0
files include/xen/interface/arch-ia64.h
line diff
     1.1 --- a/include/xen/interface/arch-ia64.h	Tue Nov 06 14:11:43 2007 -0700
     1.2 +++ b/include/xen/interface/arch-ia64.h	Wed Nov 07 15:19:39 2007 -0700
     1.3 @@ -73,6 +73,12 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
     1.4  
     1.5  typedef unsigned long xen_ulong_t;
     1.6  
     1.7 +#ifdef __XEN_TOOLS__
     1.8 +#define XEN_PAGE_SIZE XC_PAGE_SIZE
     1.9 +#else
    1.10 +#define XEN_PAGE_SIZE PAGE_SIZE
    1.11 +#endif
    1.12 +
    1.13  #define INVALID_MFN       (~0UL)
    1.14  
    1.15  #define MEM_G   (1UL << 30)
    1.16 @@ -93,16 +99,16 @@ typedef unsigned long xen_ulong_t;
    1.17  #define LEGACY_IO_SIZE   (64*MEM_M)
    1.18  
    1.19  #define IO_PAGE_START (LEGACY_IO_START + LEGACY_IO_SIZE)
    1.20 -#define IO_PAGE_SIZE  PAGE_SIZE
    1.21 +#define IO_PAGE_SIZE  XEN_PAGE_SIZE
    1.22  
    1.23  #define STORE_PAGE_START (IO_PAGE_START + IO_PAGE_SIZE)
    1.24 -#define STORE_PAGE_SIZE  PAGE_SIZE
    1.25 +#define STORE_PAGE_SIZE  XEN_PAGE_SIZE
    1.26  
    1.27 -#define BUFFER_IO_PAGE_START (STORE_PAGE_START+STORE_PAGE_SIZE)
    1.28 -#define BUFFER_IO_PAGE_SIZE PAGE_SIZE
    1.29 +#define BUFFER_IO_PAGE_START (STORE_PAGE_START + STORE_PAGE_SIZE)
    1.30 +#define BUFFER_IO_PAGE_SIZE  XEN_PAGE_SIZE
    1.31  
    1.32 -#define BUFFER_PIO_PAGE_START (BUFFER_IO_PAGE_START+BUFFER_IO_PAGE_SIZE)
    1.33 -#define BUFFER_PIO_PAGE_SIZE PAGE_SIZE
    1.34 +#define BUFFER_PIO_PAGE_START (BUFFER_IO_PAGE_START + BUFFER_IO_PAGE_SIZE)
    1.35 +#define BUFFER_PIO_PAGE_SIZE  XEN_PAGE_SIZE
    1.36  
    1.37  #define IO_SAPIC_START   0xfec00000UL
    1.38  #define IO_SAPIC_SIZE    0x100000
    1.39 @@ -417,8 +423,14 @@ struct vcpu_guest_context_regs {
    1.40           */
    1.41          unsigned int rbs_voff;
    1.42          unsigned long rbs[2048];
    1.43 -        unsigned long rbs_nat;
    1.44          unsigned long rbs_rnat;
    1.45 +
    1.46 +        /*
    1.47 +         * RSE.N_STACKED_PHYS via PAL_RSE_INFO
    1.48 +         * Strictly this isn't cpu context, but this value is necessary
    1.49 +         * for domain save/restore. So is here.
    1.50 +         */
    1.51 +        unsigned long num_phys_stacked;
    1.52  };
    1.53  
    1.54  struct vcpu_guest_context {