source: xen/xen_lustre_patch/linux-source-2.6.22-10-xen.diff @ 69

debian/binary-custom.d/xen/diff

@@ -23219 +23219 @@
 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 +23258 @@
 +
 +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 +25870 @@
 + CFI_ENDPROC
 +ENDPROC(call_softirq)
 +
-+kPROBE_ENTRY(ignore_sysret)
++KPROBE_ENTRY(ignore_sysret)
 + CFI_STARTPROC
 + mov $-ENOSYS,%eax
 + sysret
@@ -28893 +28915 @@
 +     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 +28928 @@
 +   }
 +
 +   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 +79378 @@
 + * 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);  \

debian/control

@@ -699 +699 @@
  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 +725 @@
  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}