rpms/kernel/devel kernel-2.6.spec, 1.3028, 1.3029 linux-2.6-fix-pmops-1.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4744

Modified Files:
	kernel-2.6.spec linux-2.6-fix-pmops-1.patch 
Log Message:
Re-enable pm_ops fixes



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3028
retrieving revision 1.3029
diff -u -r1.3028 -r1.3029
--- kernel-2.6.spec	30 Mar 2007 06:27:57 -0000	1.3028
+++ kernel-2.6.spec	30 Mar 2007 12:56:24 -0000	1.3029
@@ -887,9 +887,9 @@
 # ...plus some fixes not yet in Intel's tree
 %patch14 -p1
 # Power management fixes
-#%patch15 -p1
-#%patch16 -p1
-#%patch17 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 # sysrq works always
 %patch20 -p1

linux-2.6-fix-pmops-1.patch:
 arch/arm/common/sharpsl_pm.c |    1 
 arch/arm/mach-at91/pm.c      |    1 
 arch/arm/mach-omap1/pm.c     |    1 
 arch/arm/mach-omap2/pm.c     |    1 
 arch/arm/mach-pxa/pm.c       |    4 ---
 arch/arm/mach-sa1100/pm.c    |    7 -----
 arch/arm/plat-s3c24xx/pm.c   |    9 ------
 arch/sh/boards/hp6xx/pm.c    |    7 -----
 include/linux/pm.h           |   23 +++++++++--------
 kernel/power/disk.c          |   56 ++++++++++++++++++++++++++++---------------
 kernel/power/main.c          |    6 +++-
 11 files changed, 54 insertions(+), 62 deletions(-)

Index: linux-2.6-fix-pmops-1.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-fix-pmops-1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-fix-pmops-1.patch	25 Mar 2007 21:38:09 -0000	1.1
+++ linux-2.6-fix-pmops-1.patch	30 Mar 2007 12:56:24 -0000	1.2
@@ -97,7 +97,7 @@
  		if (pm_ops && pm_ops->prepare)
  			error = pm_ops->prepare(PM_SUSPEND_DISK);
  	}
-@@ -48,31 +54,33 @@ static inline int platform_prepare(void)
+@@ -48,30 +54,32 @@ static inline int platform_prepare(void)
  
  /**
   *	power_down - Shut machine down for hibernate.
@@ -114,7 +114,6 @@
 -static void power_down(suspend_disk_method_t mode)
 +static void power_down(void)
  {
- 	disable_nonboot_cpus();
 -	switch(mode) {
 -	case PM_DISK_PLATFORM:
 -		if (pm_ops && pm_ops->enter) {