Fix for #614010 in squeeze

[Roland Stigge <stigge@antcom.de>]

Hi,

I prepared a patch for #614010 (see attachment) and propose to include 
it in stable (squeeze) updates. It is squeeze specific because it 
applies to its specific 2.6.32 kernel.

Background: At some point during the squeeze freeze, when the 
Xenomai/adeos kernel patch applied to the then-current linux kernel 
2.6.32 in Debian, somehow an update to the kernel sources must have 
rendered the Xenomai/adeos patch not to apply anymore. Unfortunately, I 
didn't check it again shortly before the squeeze release. So it slipped 
through.

So either we fix it in squeeze now, or mark the bug "wontfix".

(I can prepare an upload for xenomai 2.5.4-3squeeze1.)

What do you think?

Thanks!

bye,
  Roland

Description: Fix kernel patch to apply to squeeze kernel
 This patch fixes the Xenomai adeos kernel patch to apply to the 2.6.32 kernel
 shipped by Debian squeeze.
Author: Roland Stigge <stigge@antcom.de>
Bug-Debian: http://bugs.debian.org/614010

--- xenomai-2.5.4.orig/ksrc/arch/x86/patches/adeos-ipipe-2.6.32-x86-2.7-01.patch
+++ xenomai-2.5.4/ksrc/arch/x86/patches/adeos-ipipe-2.6.32-x86-2.7-01.patch
@@ -1314,14 +1314,14 @@ index 168e172..948c033 100644
  /**
   * setup_local_APIC - setup the local APIC
 @@ -1229,7 +1233,7 @@ void __cpuinit setup_local_APIC(void)
- 		value = apic_read(APIC_ISR + i*0x10);
- 		for (j = 31; j >= 0; j--) {
- 			if (value & (1<<j))
--				ack_APIC_irq();
-+				__ack_APIC_irq();
- 		}
- 	}
- 
+ 			value = apic_read(APIC_ISR + i*0x10);
+ 			for (j = 31; j >= 0; j--) {
+ 				if (value & (1<<j)) {
+-					ack_APIC_irq();
++					__ack_APIC_irq();
+ 					acked++;
+ 				}
+	 		}
 @@ -1737,7 +1741,7 @@ void smp_spurious_interrupt(struct pt_regs *regs)
  	 */
  	v = apic_read(APIC_ISR + ((SPURIOUS_APIC_VECTOR & ~0x1f) >> 1));