git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: coding style fixes to arch/x86/kernel/cpu/mcheck/p6.c
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
cpu
/
mcheck
/
therm_throt.c
diff --git
a/arch/x86/kernel/cpu/mcheck/therm_throt.c
b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index 1203dc5ab87aa36ec2042ed8249c76892be1b20c..9b7e01daa1ca22c70830add7e46e68247f903899 100644
(file)
--- a/
arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/
arch/x86/kernel/cpu/mcheck/therm_throt.c
@@
-118,7
+118,7
@@
static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev)
static __cpuinit void thermal_throttle_remove_dev(struct sys_device *sys_dev)
{
static __cpuinit void thermal_throttle_remove_dev(struct sys_device *sys_dev)
{
-
return
sysfs_remove_group(&sys_dev->kobj, &thermal_throttle_attr_group);
+ sysfs_remove_group(&sys_dev->kobj, &thermal_throttle_attr_group);
}
/* Mutex protecting device creation against CPU hotplug */
}
/* Mutex protecting device creation against CPU hotplug */
@@
-131,17
+131,19
@@
static __cpuinit int thermal_throttle_cpu_callback(struct notifier_block *nfb,
{
unsigned int cpu = (unsigned long)hcpu;
struct sys_device *sys_dev;
{
unsigned int cpu = (unsigned long)hcpu;
struct sys_device *sys_dev;
- int err;
+ int err
= 0
;
sys_dev = get_cpu_sysdev(cpu);
switch (action) {
sys_dev = get_cpu_sysdev(cpu);
switch (action) {
- case CPU_
ONLIN
E:
- case CPU_
ONLIN
E_FROZEN:
+ case CPU_
UP_PREPAR
E:
+ case CPU_
UP_PREPAR
E_FROZEN:
mutex_lock(&therm_cpu_lock);
err = thermal_throttle_add_dev(sys_dev);
mutex_unlock(&therm_cpu_lock);
WARN_ON(err);
break;
mutex_lock(&therm_cpu_lock);
err = thermal_throttle_add_dev(sys_dev);
mutex_unlock(&therm_cpu_lock);
WARN_ON(err);
break;
+ case CPU_UP_CANCELED:
+ case CPU_UP_CANCELED_FROZEN:
case CPU_DEAD:
case CPU_DEAD_FROZEN:
mutex_lock(&therm_cpu_lock);
case CPU_DEAD:
case CPU_DEAD_FROZEN:
mutex_lock(&therm_cpu_lock);
@@
-149,10
+151,10
@@
static __cpuinit int thermal_throttle_cpu_callback(struct notifier_block *nfb,
mutex_unlock(&therm_cpu_lock);
break;
}
mutex_unlock(&therm_cpu_lock);
break;
}
- return NOTIFY_OK;
+ return
err ? NOTIFY_BAD :
NOTIFY_OK;
}
}
-static struct notifier_block thermal_throttle_cpu_notifier =
+static struct notifier_block thermal_throttle_cpu_notifier
__cpuinitdata
=
{
.notifier_call = thermal_throttle_cpu_callback,
};
{
.notifier_call = thermal_throttle_cpu_callback,
};