Skip to contentSkip to conversation

ia64 acpi.c fix for 2.6.0-test2

PATCH Takayoshi Kochi 1 participant 1 message Aug 5, 2003

lore
Share & tools
lore
#0 lore raw

Hi David,

This is a patch to fix the same problem I sent the other day for 2.4 tree.

Fortunately, we don't have problem without this patch for 2.6 because ACPI and IOSAPIC interface have the same numbers (ACPI_ACTIVE_LOW = IOSAPIC_LOW, ACPI_EDGE_SENSITIVE = IOSAPIC_EDGE, etc.) But it should be converted explicitly.

---
1st Computer Software Division, NEC Corporation Takayoshi Kochi <[email protected]/[email protected]>

Index: dcm-260t2/arch/ia64/kernel/acpi.c
===================================================================
RCS file: /data/cvsroot/lia64-2.5/arch/ia64/kernel/acpi.c,v retrieving revision 1.1.1.19

arch/ia64/kernel/acpi.c +3 -1
diff -u -r1.1.1.19 acpi.c
@@ -727,7 +727,9 @@
 		return 0;
 
 	/* Turn it on */
-	vector = iosapic_register_intr (gsi, polarity, trigger);
+	vector = iosapic_register_intr (gsi,
+			(polarity == ACPI_ACTIVE_LOW) ? IOSAPIC_POL_LOW : IOSAPIC_POL_HIGH,
+			(trigger == ACPI_EDGE_SENSITIVE) ? IOSAPIC_EDGE : IOSAPIC_LEVEL);
 	return vector;
 }