diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-19 23:01:22 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-19 23:01:22 +0100 |
| commit | 83d8977e118decfaf0405c10ab0cd5864a5af350 (patch) | |
| tree | edf8c7b7c2b928a9f939a1b8384ffec7a3492e8f | |
| parent | 9d91691f9547305f87789c8099d75f61b773cafe (diff) | |
| download | patches-83d8977e118decfaf0405c10ab0cd5864a5af350.tar.gz | |
fix power in cpu patch
| -rw-r--r-- | 09-cpu.patch | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/09-cpu.patch b/09-cpu.patch index a2dbeeb..dbc6fe0 100644 --- a/09-cpu.patch +++ b/09-cpu.patch @@ -24,7 +24,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> arch/powerpc/mm/numa.c | 8 arch/powerpc/platforms/cell/cbe_thermal.c | 162 +++++++-------- arch/powerpc/platforms/cell/spu_base.c | 61 ++--- - arch/powerpc/platforms/pseries/pseries_energy.c | 67 ++---- + arch/powerpc/platforms/pseries/pseries_energy.c | 71 +++--- arch/powerpc/sysdev/ppc4xx_cpm.c | 6 arch/s390/kernel/smp.c | 76 +++---- arch/s390/kernel/topology.c | 6 @@ -51,7 +51,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> drivers/s390/char/sclp_config.c | 8 include/linux/cpu.h | 18 - kernel/sched.c | 40 +-- - 38 files changed, 887 insertions(+), 890 deletions(-) + 38 files changed, 889 insertions(+), 892 deletions(-) --- a/arch/avr32/kernel/cpu.c +++ b/arch/avr32/kernel/cpu.c @@ -1661,7 +1661,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> { return get_best_energy_data(dev, page, 0); } -@@ -241,47 +241,47 @@ static ssize_t percpu_deactivate_hint_sh +@@ -241,48 +241,48 @@ static ssize_t percpu_deactivate_hint_sh * Per-cpu value of the hint */ @@ -1702,12 +1702,12 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> /* Create the sysfs files */ - err = sysfs_create_file(&cpu_sysdev_class.kset.kobj, - &attr_cpu_activate_hint_list.attr); -+ err = sysfs_create_file(cpu_subsys.dev_root, ++ err = device_create_file(cpu_subsys.dev_root, + &attr_cpu_activate_hint_list); if (!err) - err = sysfs_create_file(&cpu_sysdev_class.kset.kobj, - &attr_cpu_deactivate_hint_list.attr); -+ err = sysfs_create_file(cpu_subsys.dev_root, ++ err = device_create_file(cpu_subsys.dev_root, + &attr_cpu_deactivate_hint_list); if (err) @@ -1715,16 +1715,19 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> for_each_possible_cpu(cpu) { - cpu_sys_dev = get_cpu_sysdev(cpu); - err = sysfs_create_file(&cpu_sys_dev->kobj, +- &attr_percpu_activate_hint.attr); + cpu_dev = get_cpu_device(cpu); -+ err = sysfs_create_file(&cpu_dev->kobj, - &attr_percpu_activate_hint.attr); ++ err = device_create_file(cpu_dev, ++ &attr_percpu_activate_hint); if (err) break; - err = sysfs_create_file(&cpu_sys_dev->kobj, -+ err = sysfs_create_file(&cpu_dev->kobj, - &attr_percpu_deactivate_hint.attr); +- &attr_percpu_deactivate_hint.attr); ++ err = device_create_file(cpu_dev, ++ &attr_percpu_deactivate_hint); if (err) break; + } @@ -298,23 +298,20 @@ static int __init pseries_energy_init(vo static void __exit pseries_energy_cleanup(void) { @@ -1741,8 +1744,8 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> - - sysfs_remove_file(&cpu_sysdev_class.kset.kobj, - &attr_cpu_deactivate_hint_list.attr); -+ sysfs_remove_file(cpu_subsys.dev_root, &attr_cpu_activate_hint_list); -+ sysfs_remove_file(cpu_subsys.dev_root, &attr_cpu_deactivate_hint_list); ++ device_remove_file(cpu_subsys.dev_root, &attr_cpu_activate_hint_list); ++ device_remove_file(cpu_subsys.dev_root, &attr_cpu_deactivate_hint_list); for_each_possible_cpu(cpu) { - cpu_sys_dev = get_cpu_sysdev(cpu); |