projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ACPI: repair nvidia early quirk breakage on x86_64
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
early-quirks.c
diff --git
a/arch/x86_64/kernel/early-quirks.c
b/arch/x86_64/kernel/early-quirks.c
index
bd30d13
..
dec587b
100644
(file)
--- a/
arch/x86_64/kernel/early-quirks.c
+++ b/
arch/x86_64/kernel/early-quirks.c
@@
-30,11
+30,8
@@
static void via_bugs(void)
#ifdef CONFIG_ACPI
#ifdef CONFIG_ACPI
-static int nvidia_hpet_detected __initdata;
-
static int __init nvidia_hpet_check(struct acpi_table_header *header)
{
static int __init nvidia_hpet_check(struct acpi_table_header *header)
{
- nvidia_hpet_detected = 1;
return 0;
}
#endif
return 0;
}
#endif
@@
-52,9
+49,7
@@
static void nvidia_bugs(void)
if (acpi_use_timer_override)
return;
if (acpi_use_timer_override)
return;
- nvidia_hpet_detected = 0;
- acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check);
- if (nvidia_hpet_detected == 0) {
+ if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check)) {
acpi_skip_timer_override = 1;
printk(KERN_INFO "Nvidia board "
"detected. Ignoring ACPI "
acpi_skip_timer_override = 1;
printk(KERN_INFO "Nvidia board "
"detected. Ignoring ACPI "