aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.com>2007-04-25 15:31:30 -0400
committerLen Brown <len.brown@intel.com>2007-04-25 15:31:30 -0400
commitb2983f10f87423fab92326bbe1e92e2256573d4f (patch)
tree806a2afdb7c3a27d7c1d8921697fd258c918f867 /arch/i386/kernel
parent8aa55591bfea25c441117e82711cbfd7c274250a (diff)
ACPI: prevent ACPI quirk warning mass spamming in logs
The following patch prevent this warning to be displayed again & again (eg: nine times on my NForce2 motherboard) and thus improve signal to noise ratio in logs. The ATI quirk below probably needs a similar "fix" but I don't have the hardware to test. Btw arch/x86_64/kernel/early-quirks.c::nvidia_bugs() would probably need to be synced (but I don't have an x86_64 NVidia motherboard to boot test it). Still it shows the usefullity of the recent x86 merge thread. [akpm@linux-foundation.org: cleanup] Signed-off-by: Thierry Vignaud <tvignaud@mandriva.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386/kernel')
-rw-r--r--arch/i386/kernel/acpi/earlyquirk.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/i386/kernel/acpi/earlyquirk.c b/arch/i386/kernel/acpi/earlyquirk.c
index a7d22d9f3d7e..fa3255afc0f6 100644
--- a/arch/i386/kernel/acpi/earlyquirk.c
+++ b/arch/i386/kernel/acpi/earlyquirk.c
@@ -22,11 +22,14 @@ static int __init nvidia_hpet_check(struct acpi_table_header *header)
22 22
23static int __init check_bridge(int vendor, int device) 23static int __init check_bridge(int vendor, int device)
24{ 24{
25 static int warned;
25#ifdef CONFIG_ACPI 26#ifdef CONFIG_ACPI
26 /* According to Nvidia all timer overrides are bogus unless HPET 27 /* According to Nvidia all timer overrides are bogus unless HPET
27 is enabled. */ 28 is enabled. */
28 if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) { 29 if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) {
29 if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check)) { 30 if (!warned && acpi_table_parse(ACPI_SIG_HPET,
31 nvidia_hpet_check)) {
32 warned = 1;
30 acpi_skip_timer_override = 1; 33 acpi_skip_timer_override = 1;
31 printk(KERN_INFO "Nvidia board " 34 printk(KERN_INFO "Nvidia board "
32 "detected. Ignoring ACPI " 35 "detected. Ignoring ACPI "