projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
241a6a5
)
fix "hwmon: coretemp: update hotplug condition check"
author
Andrew Morton
<
[email protected]
>
Wed, 11 Aug 2010 01:01:08 +0000
(18:01 -0700)
committer
Linus Torvalds
<
[email protected]
>
Wed, 11 Aug 2010 15:58:59 +0000
(08:58 -0700)
In commit
0dca94baeab4
("hwmon: coretemp: update hotplug condition
check") we merged v2 of this patch. Update that to v3.
The difference is to remove the new and unnecesary references to
CPU_*_FROZEN.
Cc: "Rafael J. Wysocki" <
[email protected]
>
Cc: Chen Gong <
[email protected]
>
Cc: Rudolf Marek <
[email protected]
>
Cc: Huaxu Wan <
[email protected]
>
Cc: Jean Delvare <
[email protected]
>
Cc: Guenter Roeck <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/hwmon/coretemp.c
patch
|
blob
|
history
diff --git
a/drivers/hwmon/coretemp.c
b/drivers/hwmon/coretemp.c
index a92e28a35767739adb5ad8c16d36809a0007d04a..c070c9714cbe2fa84646b41626655b4c51a7157e 100644
(file)
--- a/
drivers/hwmon/coretemp.c
+++ b/
drivers/hwmon/coretemp.c
@@
-501,13
+501,10
@@
static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb,
switch (action) {
case CPU_ONLINE:
- case CPU_ONLINE_FROZEN:
case CPU_DOWN_FAILED:
- case CPU_DOWN_FAILED_FROZEN:
coretemp_device_add(cpu);
break;
case CPU_DOWN_PREPARE:
- case CPU_DOWN_PREPARE_FROZEN:
coretemp_device_remove(cpu);
break;
}