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

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	linux-2.6-x86-64_pmtrace.patch 
Log Message:
make the x86-64 pm-trace code not screw over ppc/ppc64

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-x86-64_pmtrace.patch	25 May 2007 14:57:49 -0000	1.1
+++ linux-2.6-x86-64_pmtrace.patch	29 May 2007 20:41:42 -0000	1.2
@@ -156,3 +156,15 @@
  	---help---
  	This enables some cheesy code to save the last PM event point in the
 
+--- linux-2.6.21.noarch/kernel/power/main.c~	2007-05-29 16:30:53.000000000 -0400
++++ linux-2.6.21.noarch/kernel/power/main.c	2007-05-29 16:31:18.000000000 -0400
+@@ -18,7 +18,9 @@
+ #include <linux/pm.h>
+ #include <linux/console.h>
+ #include <linux/cpu.h>
++#ifdef CONFIG_PM_TRACE
+ #include <linux/resume-trace.h>
++#endif
+ #include <linux/freezer.h>
+ #include <linux/vmstat.h>
+