From e6b9f64aa67b78443af58370330b151f060cb663 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Tue, 7 Oct 2008 06:47:52 +0200 Subject: [PATCH] --- yaml --- r: 113375 b: refs/heads/master c: 8d89adf44cf750e49691ba5b744b2ad77a05e997 h: refs/heads/master i: 113373: 9aa2648d6e0c3e38484a9b7d08b901b9c079a2e1 113371: 2fbe27772b35d3ec66f4fc2822fc6145064bff75 113367: 25e445aa2c9d273d73ecd8dce735fd4c923f177a 113359: f1421de9ab1ab15ec76db4ec0ec2ae24fe70c79c 113343: 3ca58597bacae1539f30bebbf3edc9471c1fb4cf v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/acpi/boot.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 78f29dfa6867..5ac08081949a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33fb0e4eb53f16af312f9698f974e2e64af39c12 +refs/heads/master: 8d89adf44cf750e49691ba5b744b2ad77a05e997 diff --git a/trunk/arch/x86/kernel/acpi/boot.c b/trunk/arch/x86/kernel/acpi/boot.c index c102af85df9c..096102d9b24e 100644 --- a/trunk/arch/x86/kernel/acpi/boot.c +++ b/trunk/arch/x86/kernel/acpi/boot.c @@ -1421,8 +1421,16 @@ static int __init force_acpi_ht(const struct dmi_system_id *d) */ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d) { - pr_notice("%s detected: Ignoring BIOS IRQ0 pin2 override\n", d->ident); - acpi_skip_timer_override = 1; + /* + * The ati_ixp4x0_rev() early PCI quirk should have set + * the acpi_skip_timer_override flag already: + */ + if (!acpi_skip_timer_override) { + WARN(1, KERN_ERR "ati_ixp4x0 quirk not complete.\n"); + pr_notice("%s detected: Ignoring BIOS IRQ0 pin2 override\n", + d->ident); + acpi_skip_timer_override = 1; + } return 0; }