Index: /xen/xen_lustre_patch/linux-source-2.6.22-10-xen.diff
===================================================================
--- /xen/xen_lustre_patch/linux-source-2.6.22-10-xen.diff	(revision 52)
+++ /xen/xen_lustre_patch/linux-source-2.6.22-10-xen.diff	(revision 52)
@@ -0,0 +1,100 @@
+diff --git a/debian/binary-custom.d/xen/diff b/debian/binary-custom.d/xen/diff
+index d2b6c38..13f7f3f 100644
+--- a/debian/binary-custom.d/xen/diff
++++ b/debian/binary-custom.d/xen/diff
+@@ -23219,7 +23219,7 @@ diff -Naur --exclude=debian --exclude='.git*' ubuntu-gutsy/arch/x86_64/kernel/ac
+ diff -Naur --exclude=debian --exclude='.git*' ubuntu-gutsy/arch/x86_64/kernel/apic-xen.c ubuntu-gutsy-xen-3.1/arch/x86_64/kernel/apic-xen.c
+ --- ubuntu-gutsy/arch/x86_64/kernel/apic-xen.c	1969-12-31 19:00:00.000000000 -0500
+ +++ ubuntu-gutsy-xen-3.1/arch/x86_64/kernel/apic-xen.c	2007-06-27 11:18:37.000000000 -0400
+-@@ -0,0 +1,198 @@
++@@ -0,0 +1,220 @@
+ +/*
+ + *	Local APIC handling, local APIC timers
+ + *
+@@ -23258,6 +23258,28 @@ diff -Naur --exclude=debian --exclude='.git*' ubuntu-gutsy/arch/x86_64/kernel/ap
+ +
+ +int apic_verbosity;
+ +
+++void apic_wait_icr_idle(void)
+++{
+++	while (apic_read(APIC_ICR) & APIC_ICR_BUSY)
+++		cpu_relax();
+++}
+++
+++unsigned int safe_apic_wait_icr_idle(void)
+++{
+++	unsigned int send_status;
+++	int timeout;
+++
+++	timeout = 0;
+++	do {
+++		send_status = apic_read(APIC_ICR) & APIC_ICR_BUSY;
+++		if (!send_status)
+++			break;
+++		udelay(100);
+++	} while (timeout++ < 1000);
+++
+++	return send_status;
+++}
+++
+ +/*
+ + * 'what should we do if we get a hw irq event on an illegal vector'.
+ + * each architecture has to answer this themselves.
+@@ -25848,7 +25870,7 @@ diff -Naur --exclude=debian --exclude='.git*' ubuntu-gutsy/arch/x86_64/kernel/en
+ +	CFI_ENDPROC
+ +ENDPROC(call_softirq)
+ +
+-+kPROBE_ENTRY(ignore_sysret)
+++KPROBE_ENTRY(ignore_sysret)
+ +	CFI_STARTPROC
+ +	mov $-ENOSYS,%eax
+ +	sysret
+@@ -28893,7 +28915,7 @@ diff -Naur --exclude=debian --exclude='.git*' ubuntu-gutsy/arch/x86_64/kernel/ir
+ +			continue;
+ +
+ +		/* interrupt's are disabled at this point */
+-+		spin_lock(&irq_desc[irq].lock;
+++		spin_lock(&irq_desc[irq].lock);
+ +
+ +		if (!irq_has_action(irq) ||
+ +			cpus_equal(irq_desc[irq].affinity, map)) {
+@@ -28906,7 +28928,7 @@ diff -Naur --exclude=debian --exclude='.git*' ubuntu-gutsy/arch/x86_64/kernel/ir
+ +		}
+ +
+ +		if (irq_desc[irq].chip->mask)
+-+			rq_desc[irq].chip->mask(irq);
+++			irq_desc[irq].chip->mask(irq);
+ +
+ +		if (irq_desc[irq].chip->set_affinity)
+ +			irq_desc[irq].chip->set_affinity(irq, mask);
+@@ -79356,7 +79378,7 @@ diff -Naur --exclude=debian --exclude='.git*' ubuntu-gutsy/include/asm-x86_64/ma
+ + * bit at the same time. */
+ +#define  __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
+ +#define ptep_set_access_flags(vma, address, ptep, entry, dirty)		\
+-+({
+++({									\
+ +	int __changed = !pte_same(*(ptep), entry);                  \
+ +	if (__changed && dirty)						\
+ +			ptep_establish(vma, address, ptep, entry);	\
+diff --git a/debian/control b/debian/control
+index 504aa79..387669b 100644
+--- a/debian/control
++++ b/debian/control
+@@ -699,7 +699,7 @@ Description: Linux kernel debug image for version 2.6.22 on i386
+  is uncompressed, and unstripped.
+ 
+ Package: linux-image-2.6.22-10-xen
+-Architecture: i386
++Architecture: i386 amd64
+ Section: universe/base
+ Priority: optional
+ Pre-Depends: dpkg (>= 1.10.24)
+@@ -725,7 +725,7 @@ Description: Linux kernel image for version 2.6.22 on This kernel can be used fo
+  correctly, and that supporting packages are also installed.
+ 
+ Package: linux-headers-2.6.22-10-xen
+-Architecture: i386
++Architecture: i386 amd64
+ Section: devel
+ Priority: optional
+ Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.22-10, ${shlibs:Depends}