fix power in cpu patch

1 files changed, 8 insertions, 31 deletions

diff --git a/09-cpu.patch b/09-cpu.patch
index dbc6fe0..8c2866b 100644
--- a/09-cpu.patch
+++ b/09-cpu.patch
@@ -22,7 +22,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  arch/powerpc/kernel/smp.c                       |    2 
  arch/powerpc/kernel/sysfs.c                     |  257 +++++++++++-------------
  arch/powerpc/mm/numa.c                          |    8 
- arch/powerpc/platforms/cell/cbe_thermal.c       |  162 +++++++--------
+ arch/powerpc/platforms/cell/cbe_thermal.c       |  144 ++++++-------
  arch/powerpc/platforms/cell/spu_base.c          |   61 ++---
  arch/powerpc/platforms/pseries/pseries_energy.c |   71 +++---
  arch/powerpc/sysdev/ppc4xx_cpm.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, 889 insertions(+), 892 deletions(-)
+ 38 files changed, 880 insertions(+), 883 deletions(-)
 
 --- a/arch/avr32/kernel/cpu.c
 +++ b/arch/avr32/kernel/cpu.c
@@ -1236,7 +1236,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  	value = in_be64(&pmd_regs->ts_ctsr2);
  
  	value = (value >> pos) & 0x3f;
-@@ -199,71 +199,71 @@ static ssize_t ppe_show_temp(struct sys_
+@@ -199,64 +199,64 @@ static ssize_t ppe_show_temp(struct sys_
  
  /* shows the temperature of the DTS on the PPE,
   * located near the linear thermal sensor */
@@ -1315,7 +1315,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  
  
 -static struct sysdev_attribute attr_spu_temperature = {
-+static struct device_attribute dev_attr_spu_temperature = {
++static struct device_attribute attr_spu_temperature = {
  	.attr = {.name = "temperature", .mode = 0400 },
  	.show = spu_show_temp,
  };
@@ -1329,29 +1329,18 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  
  
  static struct attribute *spu_attributes[] = {
--	&attr_spu_temperature.attr,
--	&attr_spu_throttle_end.attr,
--	&attr_spu_throttle_begin.attr,
--	&attr_spu_throttle_full_stop.attr,
-+	&dev_attr_spu_temperature.attr,
-+	&dev_attr_spu_throttle_end.attr,
-+	&dev_attr_spu_throttle_begin.attr,
-+	&dev_attr_spu_throttle_full_stop.attr,
- 	NULL,
- };
- 
-@@ -272,26 +272,26 @@ static struct attribute_group spu_attrib
+@@ -272,19 +272,19 @@ static struct attribute_group spu_attrib
  	.attrs	= spu_attributes,
  };
  
 -static struct sysdev_attribute attr_ppe_temperature0 = {
-+static struct device_attribute dev_attr_ppe_temperature0 = {
++static struct device_attribute attr_ppe_temperature0 = {
  	.attr = {.name = "temperature0", .mode = 0400 },
  	.show = ppe_show_temp0,
  };
  
 -static struct sysdev_attribute attr_ppe_temperature1 = {
-+static struct device_attribute dev_attr_ppe_temperature1 = {
++static struct device_attribute attr_ppe_temperature1 = {
  	.attr = {.name = "temperature1", .mode = 0400 },
  	.show = ppe_show_temp1,
  };
@@ -1364,19 +1353,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
 +static DEVICE_PREFIX_ATTR(ppe, throttle_full_stop, 0600);
  
  static struct attribute *ppe_attributes[] = {
--	&attr_ppe_temperature0.attr,
--	&attr_ppe_temperature1.attr,
--	&attr_ppe_throttle_end.attr,
--	&attr_ppe_throttle_begin.attr,
--	&attr_ppe_throttle_full_stop.attr,
-+	&dev_attr_ppe_temperature0.attr,
-+	&dev_attr_ppe_temperature1.attr,
-+	&dev_attr_ppe_throttle_end.attr,
-+	&dev_attr_ppe_throttle_begin.attr,
-+	&dev_attr_ppe_throttle_full_stop.attr,
- 	NULL,
- };
- 
+ 	&attr_ppe_temperature0.attr,
 @@ -307,7 +307,7 @@ static int __init init_default_values(vo
  {
  	int cpu;