ia64/xen-unstable

changeset 13095:7fe141be5e14

[IA64] fix build with sn2 and machvec support

Initial changes to make tree build again after applying new files for
sn2 and machvec support, without actually enabling the new features

Signed-off-by: Jes Sorensen <jes@sgi.com>
author awilliam@xenbuild2.aw
date Wed Dec 13 11:18:16 2006 -0700 (2006-12-13)
parents c3c46d84d8e6
children ad886b6bdfd6
files xen/include/asm-ia64/linux-xen/asm/sn/intr.h xen/include/asm-ia64/linux-xen/asm/sn/nodepda.h xen/include/asm-ia64/linux-xen/asm/sn/types.h xen/include/asm-ia64/linux-xen/asm/types.h
line diff
     1.1 --- a/xen/include/asm-ia64/linux-xen/asm/sn/intr.h	Wed Dec 13 11:11:32 2006 -0700
     1.2 +++ b/xen/include/asm-ia64/linux-xen/asm/sn/intr.h	Wed Dec 13 11:18:16 2006 -0700
     1.3 @@ -9,7 +9,11 @@
     1.4  #ifndef _ASM_IA64_SN_INTR_H
     1.5  #define _ASM_IA64_SN_INTR_H
     1.6  
     1.7 +#ifndef XEN
     1.8  #include <linux/rcupdate.h>
     1.9 +#else
    1.10 +#include <linux/list.h>
    1.11 +#endif
    1.12  #include <asm/sn/types.h>
    1.13  
    1.14  #define SGI_UART_VECTOR		0xe9
    1.15 @@ -51,7 +55,9 @@ struct sn_irq_info {
    1.16  	int		irq_flags;	/* flags */
    1.17  	int		irq_share_cnt;	/* num devices sharing IRQ   */
    1.18  	struct list_head	list;	/* list of sn_irq_info structs */
    1.19 +#ifndef XEN
    1.20  	struct rcu_head		rcu;	/* rcu callback list */
    1.21 +#endif
    1.22  };
    1.23  
    1.24  extern void sn_send_IPI_phys(int, long, int, int);
     2.1 --- a/xen/include/asm-ia64/linux-xen/asm/sn/nodepda.h	Wed Dec 13 11:11:32 2006 -0700
     2.2 +++ b/xen/include/asm-ia64/linux-xen/asm/sn/nodepda.h	Wed Dec 13 11:18:16 2006 -0700
     2.3 @@ -13,7 +13,9 @@
     2.4  #include <asm/irq.h>
     2.5  #include <asm/sn/arch.h>
     2.6  #include <asm/sn/intr.h>
     2.7 +#ifndef XEN
     2.8  #include <asm/sn/bte.h>
     2.9 +#endif
    2.10  
    2.11  /*
    2.12   * NUMA Node-Specific Data structures are defined in this file.
    2.13 @@ -38,12 +40,14 @@ struct phys_cpuid {
    2.14  struct nodepda_s {
    2.15  	void 		*pdinfo;	/* Platform-dependent per-node info */
    2.16  
    2.17 +#ifndef XEN
    2.18  	/*
    2.19  	 * The BTEs on this node are shared by the local cpus
    2.20  	 */
    2.21  	struct bteinfo_s	bte_if[MAX_BTES_PER_NODE];	/* Virtual Interface */
    2.22  	struct timer_list	bte_recovery_timer;
    2.23  	spinlock_t		bte_recovery_lock;
    2.24 +#endif
    2.25  
    2.26  	/* 
    2.27  	 * Array of pointers to the nodepdas for each node.
     3.1 --- a/xen/include/asm-ia64/linux-xen/asm/sn/types.h	Wed Dec 13 11:11:32 2006 -0700
     3.2 +++ b/xen/include/asm-ia64/linux-xen/asm/sn/types.h	Wed Dec 13 11:18:16 2006 -0700
     3.3 @@ -20,7 +20,9 @@ typedef unsigned char	slotid_t;	/* slot 
     3.4  typedef unsigned char	slabid_t;	/* slab (asic) within slot */
     3.5  typedef u64 nic_t;
     3.6  typedef unsigned long iopaddr_t;
     3.7 +#ifndef XEN
     3.8  typedef unsigned long paddr_t;
     3.9 +#endif
    3.10  typedef short cnodeid_t;
    3.11  
    3.12  #endif /* _ASM_IA64_SN_TYPES_H */
     4.1 --- a/xen/include/asm-ia64/linux-xen/asm/types.h	Wed Dec 13 11:11:32 2006 -0700
     4.2 +++ b/xen/include/asm-ia64/linux-xen/asm/types.h	Wed Dec 13 11:18:16 2006 -0700
     4.3 @@ -74,6 +74,14 @@ typedef unsigned short kmem_bufctl_t;
     4.4  
     4.5  #ifdef XEN
     4.6  #include <asm/xentypes.h>
     4.7 +
     4.8 +#ifndef __ASSEMBLY__
     4.9 +typedef unsigned int gfp_t;
    4.10 +typedef u64 resource_size_t;
    4.11 +typedef u32 dev_t;
    4.12 +typedef unsigned int mode_t;
    4.13 +#define THIS_MODULE	NULL
    4.14 +#endif
    4.15  #endif
    4.16  
    4.17  #endif /* _ASM_IA64_TYPES_H */