rpms/kernel/F-9 linux-2.6.27.5-revert-sched-clock-prevent-scd-clock-from-moving-back.patch, NONE, 1.1 kernel.spec, 1.884, 1.885

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29370

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.27.5-revert-sched-clock-prevent-scd-clock-from-moving-back.patch 
Log Message:
Revert -stable patch that causes suspend problems (L-K BZ 12149, 12155)

linux-2.6.27.5-revert-sched-clock-prevent-scd-clock-from-moving-back.patch:

--- NEW FILE linux-2.6.27.5-revert-sched-clock-prevent-scd-clock-from-moving-back.patch ---
From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun, 14 Dec 2008 23:46:01 +0000 (-0800)
Subject: Revert "sched_clock: prevent scd->clock from moving backwards"
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ca7e716c7833aeaeb8fedd6d004c5f5d5e14d325

Revert "sched_clock: prevent scd->clock from moving backwards"

This reverts commit 5b7dba4ff834259a5623e03a565748704a8fe449, which
caused a regression in hibernate, reported by and bisected by Fabio
Comolli.

This revert fixes

 http://bugzilla.kernel.org/show_bug.cgi?id=12155
 http://bugzilla.kernel.org/show_bug.cgi?id=12149

Bisected-by: Fabio Comolli <fabio.comolli at gmail.com>
Requested-by: Rafael J. Wysocki <rjw at sisk.pl>
Acked-by: Dave Kleikamp <shaggy at linux.vnet.ibm.com>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c
index 8178724..e8ab096 100644
--- a/kernel/sched_clock.c
+++ b/kernel/sched_clock.c
@@ -118,13 +118,13 @@ static u64 __update_sched_clock(struct sched_clock_data *scd, u64 now)
 
 	/*
 	 * scd->clock = clamp(scd->tick_gtod + delta,
-	 *		      max(scd->tick_gtod, scd->clock),
-	 *		      max(scd->clock, scd->tick_gtod + TICK_NSEC));
+	 * 		      max(scd->tick_gtod, scd->clock),
+	 * 		      scd->tick_gtod + TICK_NSEC);
 	 */
 
 	clock = scd->tick_gtod + delta;
 	min_clock = wrap_max(scd->tick_gtod, scd->clock);
-	max_clock = wrap_max(scd->clock, scd->tick_gtod + TICK_NSEC);
+	max_clock = scd->tick_gtod + TICK_NSEC;
 
 	clock = wrap_max(clock, min_clock);
 	clock = wrap_min(clock, max_clock);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.884
retrieving revision 1.885
diff -u -r1.884 -r1.885
--- kernel.spec	16 Dec 2008 16:36:40 -0000	1.884
+++ kernel.spec	16 Dec 2008 16:55:26 -0000	1.885
@@ -602,6 +602,8 @@
 Patch15: linux-2.6-lib-idr-fix-bug-introduced-by-rcu-fix.patch
 # fix VMI crash in 27.7
 Patch16: linux-2.6.27.7-vmi-fix-crash-on-boot.patch
+# fix 2.6.27.5 suspend regression
+Patch17: linux-2.6.27.5-revert-sched-clock-prevent-scd-clock-from-moving-back.patch
 
 Patch21: linux-2.6-utrace.patch
 Patch22: linux-2.6-x86-tracehook.patch
@@ -1098,6 +1100,7 @@
 
 ApplyPatch linux-2.6-lib-idr-fix-bug-introduced-by-rcu-fix.patch
 ApplyPatch linux-2.6.27.7-vmi-fix-crash-on-boot.patch
+ApplyPatch linux-2.6.27.5-revert-sched-clock-prevent-scd-clock-from-moving-back.patch
 
 # Roland's utrace ptrace replacement.
 ApplyPatch linux-2.6-utrace.patch
@@ -1928,6 +1931,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Tue Dec 16 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-72
+- Revert -stable patch that causes suspend problems (L-K BZ 12149, 12155)
+
 * Tue Dec 16 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-71
 - Fix the CDROM door status (from rawhide)