rpms/kernel/F-7 linux-2.6-x86-64_pmtrace.patch,1.2,1.3

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27817

Modified Files:
	linux-2.6-x86-64_pmtrace.patch 
Log Message:
this, sucks.

linux-2.6-x86-64_pmtrace.patch:

Index: linux-2.6-x86-64_pmtrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-x86-64_pmtrace.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-x86-64_pmtrace.patch	29 May 2007 20:41:42 -0000	1.2
+++ linux-2.6-x86-64_pmtrace.patch	29 May 2007 21:03:14 -0000	1.3
@@ -168,3 +168,54 @@
  #include <linux/freezer.h>
  #include <linux/vmstat.h>
  
+--- linux-2.6.21.noarch/drivers/base/power/resume.c~	2007-05-29 17:01:33.000000000 -0400
++++ linux-2.6.21.noarch/drivers/base/power/resume.c	2007-05-29 17:02:46.000000000 -0400
+@@ -9,7 +9,9 @@
+  */
+ 
+ #include <linux/device.h>
++#ifdef CONFIG_PM_TRACE
+ #include <linux/resume-trace.h>
++#endif
+ #include "../base.h"
+ #include "power.h"
+ 
+@@ -24,8 +26,10 @@ int resume_device(struct device * dev)
+ {
+ 	int error = 0;
+ 
++#ifdef CONFIG_PM_TRACE
+ 	TRACE_DEVICE(dev);
+ 	TRACE_RESUME(0);
++#endif
+ 	down(&dev->sem);
+ 	if (dev->power.pm_parent
+ 			&& dev->power.pm_parent->power.power_state.event) {
+@@ -43,7 +47,9 @@ int resume_device(struct device * dev)
+ 		error = dev->class->resume(dev);
+ 	}
+ 	up(&dev->sem);
++#ifdef CONFIG_PM_TRACE
+ 	TRACE_RESUME(error);
++#endif
+ 	return error;
+ }
+ 
+@@ -52,13 +58,17 @@ static int resume_device_early(struct de
+ {
+ 	int error = 0;
+ 
++#ifdef CONFIG_PM_TRACE
+ 	TRACE_DEVICE(dev);
+ 	TRACE_RESUME(0);
++#endif
+ 	if (dev->bus && dev->bus->resume_early) {
+ 		dev_dbg(dev,"EARLY resume\n");
+ 		error = dev->bus->resume_early(dev);
+ 	}
++#ifdef CONFIG_PM_TRACE
+ 	TRACE_RESUME(error);
++#endif
+ 	return error;
+ }
+