Changes to make the tree build again after applying the news files,
without enabling machvec+sn2 support.
Cheers,
Jes
# HG changeset patch
# User jes@xxxxxxxxxxxxxxxx
# Date 1166020323 -3600
# Node ID f936608bf9f88acae521a9cbe86ae253eede6fde
# Parent 9c94e874e26580cee01452151fe0ada3f503375c
Initial changes to make tree build again after applying new files for sn2 and
machvec support, without actually enabling the new features
diff -r 9c94e874e265 -r f936608bf9f8
xen/include/asm-ia64/linux-xen/asm/sn/intr.h
--- a/xen/include/asm-ia64/linux-xen/asm/sn/intr.h Wed Dec 13 15:25:15
2006 +0100
+++ b/xen/include/asm-ia64/linux-xen/asm/sn/intr.h Wed Dec 13 15:32:03
2006 +0100
@@ -9,7 +9,11 @@
#ifndef _ASM_IA64_SN_INTR_H
#define _ASM_IA64_SN_INTR_H
+#ifndef XEN
#include <linux/rcupdate.h>
+#else
+#include <linux/list.h>
+#endif
#include <asm/sn/types.h>
#define SGI_UART_VECTOR 0xe9
@@ -51,7 +55,9 @@ struct sn_irq_info {
int irq_flags; /* flags */
int irq_share_cnt; /* num devices sharing IRQ */
struct list_head list; /* list of sn_irq_info structs */
+#ifndef XEN
struct rcu_head rcu; /* rcu callback list */
+#endif
};
extern void sn_send_IPI_phys(int, long, int, int);
diff -r 9c94e874e265 -r f936608bf9f8
xen/include/asm-ia64/linux-xen/asm/sn/nodepda.h
--- a/xen/include/asm-ia64/linux-xen/asm/sn/nodepda.h Wed Dec 13 15:25:15
2006 +0100
+++ b/xen/include/asm-ia64/linux-xen/asm/sn/nodepda.h Wed Dec 13 15:32:03
2006 +0100
@@ -13,7 +13,9 @@
#include <asm/irq.h>
#include <asm/sn/arch.h>
#include <asm/sn/intr.h>
+#ifndef XEN
#include <asm/sn/bte.h>
+#endif
/*
* NUMA Node-Specific Data structures are defined in this file.
@@ -38,12 +40,14 @@ struct nodepda_s {
struct nodepda_s {
void *pdinfo; /* Platform-dependent per-node info */
+#ifndef XEN
/*
* The BTEs on this node are shared by the local cpus
*/
struct bteinfo_s bte_if[MAX_BTES_PER_NODE]; /* Virtual
Interface */
struct timer_list bte_recovery_timer;
spinlock_t bte_recovery_lock;
+#endif
/*
* Array of pointers to the nodepdas for each node.
diff -r 9c94e874e265 -r f936608bf9f8
xen/include/asm-ia64/linux-xen/asm/sn/types.h
--- a/xen/include/asm-ia64/linux-xen/asm/sn/types.h Wed Dec 13 15:25:15
2006 +0100
+++ b/xen/include/asm-ia64/linux-xen/asm/sn/types.h Wed Dec 13 15:32:03
2006 +0100
@@ -20,7 +20,6 @@ typedef unsigned char slabid_t; /* slab
typedef unsigned char slabid_t; /* slab (asic) within slot */
typedef u64 nic_t;
typedef unsigned long iopaddr_t;
-typedef unsigned long paddr_t;
typedef short cnodeid_t;
#endif /* _ASM_IA64_SN_TYPES_H */
diff -r 9c94e874e265 -r f936608bf9f8 xen/include/asm-ia64/linux-xen/asm/types.h
--- a/xen/include/asm-ia64/linux-xen/asm/types.h Wed Dec 13 15:25:15
2006 +0100
+++ b/xen/include/asm-ia64/linux-xen/asm/types.h Wed Dec 13 15:32:03
2006 +0100
@@ -74,6 +74,14 @@ typedef unsigned short kmem_bufctl_t;
#ifdef XEN
#include <asm/xentypes.h>
+
+#ifndef __ASSEMBLY__
+typedef unsigned int gfp_t;
+typedef u64 resource_size_t;
+typedef u32 dev_t;
+typedef unsigned int mode_t;
+#define THIS_MODULE NULL
+#endif
#endif
#endif /* _ASM_IA64_TYPES_H */
_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel
|
Home