- fix 32-bit breakage on rt/threadirqs branch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Steven,

Attached is a patch that fixes the 32-bit compile breakage you told me about on the rt/threadirqs branch. Compiles with an allmodconfig build.

Clark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEARECAAYFAklCw48ACgkQHyuj/+TTEp0r3wCaAj0QN4BxLJgifrqYxE1w2Drk utkAoJyYSvb+6vrWn6b+I/Swc+4jWUyk
=HhS3
-----END PGP SIGNATURE-----

From e1d9cd6f8aa7261cbf299ad222e7e7cf8b0cce65 Mon Sep 17 00:00:00 2001
From: Clark Williams <[email protected]>
Date: Fri, 12 Dec 2008 12:21:04 -0600
Subject: [PATCH] fixed 32-bit breakage in arch/x86/kernel/io_apic.c

I pulled in the wrong functions when merging 32 and 64-bit for threaded IRQs, then didn't test the 32-bit build. Builds now with allmodconfig.

---
 arch/x86/kernel/io_apic.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

index 311d003..a66efd7 100644
@@ -2412,10 +2412,8 @@ static void ack_apic_level(unsigned int irq)
 	if (!(v & (1 << (i & 0x1f)))) {
 		atomic_inc(&irq_mis_count);
 		spin_lock(&ioapic_lock);
-		/* mask = 1, trigger = 0 */
-		__modify_IO_APIC_irq(irq, 0x00010000, 0x00008000);
-		/* mask = 0, trigger = 1 */
-		__modify_IO_APIC_irq(irq, 0x00008000, 0x00010000);
+                __mask_and_edge_IO_APIC_irq(irq);
+                __unmask_and_level_IO_APIC_irq(irq);
 		spin_unlock(&ioapic_lock);
 	}
 #endif

1.5.5.1