From c5d7956ccac5c22f139f4c42bcad90e5b7d54c3c Mon Sep 17 00:00:00 2001 From: Liu Jiang Date: Tue, 13 Mar 2012 22:07:09 +0800 Subject: [PATCH] --- yaml --- r: 295296 b: refs/heads/master c: 0577bb661ee0ce4303c21353ac326f23efbc209c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/acpi.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a26308333472..c65a6c24434a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15839b4774c618117122074c630a49983f515318 +refs/heads/master: 0577bb661ee0ce4303c21353ac326f23efbc209c diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c index 5207035dc061..2d801bfe16ac 100644 --- a/trunk/arch/ia64/kernel/acpi.c +++ b/trunk/arch/ia64/kernel/acpi.c @@ -349,11 +349,11 @@ acpi_parse_int_src_ovr(struct acpi_subtable_header * header, iosapic_override_isa_irq(p->source_irq, p->global_irq, ((p->inti_flags & ACPI_MADT_POLARITY_MASK) == - ACPI_MADT_POLARITY_ACTIVE_HIGH) ? - IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW, + ACPI_MADT_POLARITY_ACTIVE_LOW) ? + IOSAPIC_POL_LOW : IOSAPIC_POL_HIGH, ((p->inti_flags & ACPI_MADT_TRIGGER_MASK) == - ACPI_MADT_TRIGGER_EDGE) ? - IOSAPIC_EDGE : IOSAPIC_LEVEL); + ACPI_MADT_TRIGGER_LEVEL) ? + IOSAPIC_LEVEL : IOSAPIC_EDGE); return 0; }