Commit 055be65c authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/davem/BK/net-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 3d5fa36b 24d87639
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
unsigned long dmi_broken; unsigned long dmi_broken;
int is_sony_vaio_laptop; int is_sony_vaio_laptop;
int is_unsafe_smbus;
struct dmi_header struct dmi_header
{ {
...@@ -459,6 +460,19 @@ static int __init apm_kills_local_apic_timer(struct dmi_blacklist *d) ...@@ -459,6 +460,19 @@ static int __init apm_kills_local_apic_timer(struct dmi_blacklist *d)
return 0; return 0;
} }
/*
* Don't access SMBus on IBM systems which get corrupted eeproms
*/
static __init int disable_smbus(struct dmi_blacklist *d)
{
if (is_unsafe_smbus == 0) {
is_unsafe_smbus = 1;
printk(KERN_INFO "%s machine detected. Disabling SMBus accesses.\n", d->ident);
}
return 0;
}
/* /*
* Simple "print if true" callback * Simple "print if true" callback
*/ */
...@@ -732,6 +746,15 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={ ...@@ -732,6 +746,15 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={
NO_MATCH, NO_MATCH, NO_MATCH NO_MATCH, NO_MATCH, NO_MATCH
} }, } },
/*
* SMBus / sensors settings
*/
{ disable_smbus, "IBM", {
MATCH(DMI_SYS_VENDOR, "IBM"),
NO_MATCH, NO_MATCH, NO_MATCH
} },
{ NULL, } { NULL, }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment