[52] | 1 | diff --git a/debian/binary-custom.d/xen/diff b/debian/binary-custom.d/xen/diff |
---|
| 2 | index d2b6c38..13f7f3f 100644 |
---|
| 3 | --- a/debian/binary-custom.d/xen/diff |
---|
| 4 | +++ b/debian/binary-custom.d/xen/diff |
---|
| 5 | @@ -23219,7 +23219,7 @@ diff -Naur --exclude=debian --exclude='.git*' ubuntu-gutsy/arch/x86_64/kernel/ac |
---|
| 6 | 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 |
---|
| 7 | --- ubuntu-gutsy/arch/x86_64/kernel/apic-xen.c 1969-12-31 19:00:00.000000000 -0500 |
---|
| 8 | +++ ubuntu-gutsy-xen-3.1/arch/x86_64/kernel/apic-xen.c 2007-06-27 11:18:37.000000000 -0400 |
---|
| 9 | -@@ -0,0 +1,198 @@ |
---|
| 10 | +@@ -0,0 +1,220 @@ |
---|
| 11 | +/* |
---|
| 12 | + * Local APIC handling, local APIC timers |
---|
| 13 | + * |
---|
| 14 | @@ -23258,6 +23258,28 @@ diff -Naur --exclude=debian --exclude='.git*' ubuntu-gutsy/arch/x86_64/kernel/ap |
---|
| 15 | + |
---|
| 16 | +int apic_verbosity; |
---|
| 17 | + |
---|
| 18 | ++void apic_wait_icr_idle(void) |
---|
| 19 | ++{ |
---|
| 20 | ++ while (apic_read(APIC_ICR) & APIC_ICR_BUSY) |
---|
| 21 | ++ cpu_relax(); |
---|
| 22 | ++} |
---|
| 23 | ++ |
---|
| 24 | ++unsigned int safe_apic_wait_icr_idle(void) |
---|
| 25 | ++{ |
---|
| 26 | ++ unsigned int send_status; |
---|
| 27 | ++ int timeout; |
---|
| 28 | ++ |
---|
| 29 | ++ timeout = 0; |
---|
| 30 | ++ do { |
---|
| 31 | ++ send_status = apic_read(APIC_ICR) & APIC_ICR_BUSY; |
---|
| 32 | ++ if (!send_status) |
---|
| 33 | ++ break; |
---|
| 34 | ++ udelay(100); |
---|
| 35 | ++ } while (timeout++ < 1000); |
---|
| 36 | ++ |
---|
| 37 | ++ return send_status; |
---|
| 38 | ++} |
---|
| 39 | ++ |
---|
| 40 | +/* |
---|
| 41 | + * 'what should we do if we get a hw irq event on an illegal vector'. |
---|
| 42 | + * each architecture has to answer this themselves. |
---|
| 43 | @@ -25848,7 +25870,7 @@ diff -Naur --exclude=debian --exclude='.git*' ubuntu-gutsy/arch/x86_64/kernel/en |
---|
| 44 | + CFI_ENDPROC |
---|
| 45 | +ENDPROC(call_softirq) |
---|
| 46 | + |
---|
| 47 | -+kPROBE_ENTRY(ignore_sysret) |
---|
| 48 | ++KPROBE_ENTRY(ignore_sysret) |
---|
| 49 | + CFI_STARTPROC |
---|
| 50 | + mov $-ENOSYS,%eax |
---|
| 51 | + sysret |
---|
| 52 | @@ -28893,7 +28915,7 @@ diff -Naur --exclude=debian --exclude='.git*' ubuntu-gutsy/arch/x86_64/kernel/ir |
---|
| 53 | + continue; |
---|
| 54 | + |
---|
| 55 | + /* interrupt's are disabled at this point */ |
---|
| 56 | -+ spin_lock(&irq_desc[irq].lock; |
---|
| 57 | ++ spin_lock(&irq_desc[irq].lock); |
---|
| 58 | + |
---|
| 59 | + if (!irq_has_action(irq) || |
---|
| 60 | + cpus_equal(irq_desc[irq].affinity, map)) { |
---|
| 61 | @@ -28906,7 +28928,7 @@ diff -Naur --exclude=debian --exclude='.git*' ubuntu-gutsy/arch/x86_64/kernel/ir |
---|
| 62 | + } |
---|
| 63 | + |
---|
| 64 | + if (irq_desc[irq].chip->mask) |
---|
| 65 | -+ rq_desc[irq].chip->mask(irq); |
---|
| 66 | ++ irq_desc[irq].chip->mask(irq); |
---|
| 67 | + |
---|
| 68 | + if (irq_desc[irq].chip->set_affinity) |
---|
| 69 | + irq_desc[irq].chip->set_affinity(irq, mask); |
---|
| 70 | @@ -79356,7 +79378,7 @@ diff -Naur --exclude=debian --exclude='.git*' ubuntu-gutsy/include/asm-x86_64/ma |
---|
| 71 | + * bit at the same time. */ |
---|
| 72 | +#define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS |
---|
| 73 | +#define ptep_set_access_flags(vma, address, ptep, entry, dirty) \ |
---|
| 74 | -+({ |
---|
| 75 | ++({ \ |
---|
| 76 | + int __changed = !pte_same(*(ptep), entry); \ |
---|
| 77 | + if (__changed && dirty) \ |
---|
| 78 | + ptep_establish(vma, address, ptep, entry); \ |
---|
| 79 | diff --git a/debian/control b/debian/control |
---|
| 80 | index 504aa79..387669b 100644 |
---|
| 81 | --- a/debian/control |
---|
| 82 | +++ b/debian/control |
---|
| 83 | @@ -699,7 +699,7 @@ Description: Linux kernel debug image for version 2.6.22 on i386 |
---|
| 84 | is uncompressed, and unstripped. |
---|
| 85 | |
---|
| 86 | Package: linux-image-2.6.22-10-xen |
---|
| 87 | -Architecture: i386 |
---|
| 88 | +Architecture: i386 amd64 |
---|
| 89 | Section: universe/base |
---|
| 90 | Priority: optional |
---|
| 91 | Pre-Depends: dpkg (>= 1.10.24) |
---|
| 92 | @@ -725,7 +725,7 @@ Description: Linux kernel image for version 2.6.22 on This kernel can be used fo |
---|
| 93 | correctly, and that supporting packages are also installed. |
---|
| 94 | |
---|
| 95 | Package: linux-headers-2.6.22-10-xen |
---|
| 96 | -Architecture: i386 |
---|
| 97 | +Architecture: i386 amd64 |
---|
| 98 | Section: devel |
---|
| 99 | Priority: optional |
---|
| 100 | Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.22-10, ${shlibs:Depends} |
---|