git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.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
c2a8b26
..
4b68326
100644
(file)
--- a/
arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/
arch/x86/kernel/cpu/mcheck/therm_throt.c
@@
-202,10
+202,11
@@
static int therm_throt_process(bool new_event, int event, int level)
#ifdef CONFIG_SYSFS
/* Add/Remove thermal_throttle interface for CPU device: */
#ifdef CONFIG_SYSFS
/* Add/Remove thermal_throttle interface for CPU device: */
-static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev)
+static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev,
+ unsigned int cpu)
{
int err;
{
int err;
- struct cpuinfo_x86 *c = &cpu_data(
smp_processor_id()
);
+ struct cpuinfo_x86 *c = &cpu_data(
cpu
);
err = sysfs_create_group(&sys_dev->kobj, &thermal_attr_group);
if (err)
err = sysfs_create_group(&sys_dev->kobj, &thermal_attr_group);
if (err)
@@
-215,7
+216,7
@@
static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev)
err = sysfs_add_file_to_group(&sys_dev->kobj,
&attr_core_power_limit_count.attr,
thermal_attr_group.name);
err = sysfs_add_file_to_group(&sys_dev->kobj,
&attr_core_power_limit_count.attr,
thermal_attr_group.name);
- if (cpu_has(c, X86_FEATURE_PTS))
+ if (cpu_has(c, X86_FEATURE_PTS))
{
err = sysfs_add_file_to_group(&sys_dev->kobj,
&attr_package_throttle_count.attr,
thermal_attr_group.name);
err = sysfs_add_file_to_group(&sys_dev->kobj,
&attr_package_throttle_count.attr,
thermal_attr_group.name);
@@
-223,6
+224,7
@@
static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev)
err = sysfs_add_file_to_group(&sys_dev->kobj,
&attr_package_power_limit_count.attr,
thermal_attr_group.name);
err = sysfs_add_file_to_group(&sys_dev->kobj,
&attr_package_power_limit_count.attr,
thermal_attr_group.name);
+ }
return err;
}
return err;
}
@@
-251,7
+253,7
@@
thermal_throttle_cpu_callback(struct notifier_block *nfb,
case CPU_UP_PREPARE:
case CPU_UP_PREPARE_FROZEN:
mutex_lock(&therm_cpu_lock);
case CPU_UP_PREPARE:
case CPU_UP_PREPARE_FROZEN:
mutex_lock(&therm_cpu_lock);
- err = thermal_throttle_add_dev(sys_dev);
+ err = thermal_throttle_add_dev(sys_dev
, cpu
);
mutex_unlock(&therm_cpu_lock);
WARN_ON(err);
break;
mutex_unlock(&therm_cpu_lock);
WARN_ON(err);
break;
@@
-287,7
+289,7
@@
static __init int thermal_throttle_init_device(void)
#endif
/* connect live CPUs to sysfs */
for_each_online_cpu(cpu) {
#endif
/* connect live CPUs to sysfs */
for_each_online_cpu(cpu) {
- err = thermal_throttle_add_dev(get_cpu_sysdev(cpu));
+ err = thermal_throttle_add_dev(get_cpu_sysdev(cpu)
, cpu
);
WARN_ON(err);
}
#ifdef CONFIG_HOTPLUG_CPU
WARN_ON(err);
}
#ifdef CONFIG_HOTPLUG_CPU
@@
-348,7
+350,7
@@
static void intel_thermal_interrupt(void)
static void unexpected_thermal_interrupt(void)
{
static void unexpected_thermal_interrupt(void)
{
- printk(KERN_ERR "CPU%d: Unexpected LVT
TMR
interrupt!\n",
+ printk(KERN_ERR "CPU%d: Unexpected LVT
thermal
interrupt!\n",
smp_processor_id());
add_taint(TAINT_MACHINE_CHECK);
}
smp_processor_id());
add_taint(TAINT_MACHINE_CHECK);
}