[kernel/f16] Silence the timekeeping "Adjusting tsc more then 11%" spew. (rhbz 798600)

Dave Jones davej at fedoraproject.org
Fri Mar 30 18:57:02 UTC 2012


commit d15571e206b48a35979c1e924b8e0d991c98c76c
Author: Dave Jones <davej at redhat.com>
Date:   Fri Mar 30 14:56:55 2012 -0400

    Silence the timekeeping "Adjusting tsc more then 11%" spew. (rhbz 798600)

 kernel.spec                    |    6 ++++++
 silence-timekeeping-spew.patch |   16 ++++++++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index b18610a..cc9f891 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -678,6 +678,7 @@ Patch470: die-floppy-die.patch
 Patch471: floppy-drop-disable_hlt-warning.patch
 
 Patch510: linux-2.6-silence-noise.patch
+Patch511: silence-timekeeping-spew.patch
 Patch520: quite-apm.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
 
@@ -1374,6 +1375,8 @@ ApplyPatch linux-2.6-serial-460800.patch
 # Silence some useless messages that still get printed with 'quiet'
 ApplyPatch linux-2.6-silence-noise.patch
 
+ApplyPatch silence-timekeeping-spew.patch
+
 # Make fbcon not show the penguins with 'quiet'
 ApplyPatch linux-2.6-silence-fbcon-logo.patch
 
@@ -2224,6 +2227,9 @@ fi
 # and build.
 
 %changelog
+* Fri Mar 30 2012 Dave Jones <davej at redhat.com>
+- Silence the timekeeping "Adjusting tsc more then 11%" spew. (rhbz 798600)
+
 * Fri Mar 30 2012 Josh Boyer <jwboyer at redhat.com>
 - Fix i915 fbdev cursor blink around suspend/hibernate from Dave Airlied
 - CVE-2012-1601: kvm: NULL dereference from irqchip_in_kernel and
diff --git a/silence-timekeeping-spew.patch b/silence-timekeeping-spew.patch
new file mode 100644
index 0000000..19416d4
--- /dev/null
+++ b/silence-timekeeping-spew.patch
@@ -0,0 +1,16 @@
+--- linux-3.3.0-4.fc17.noarch/kernel/time/timekeeping.c~	2012-03-30 14:18:15.591162207 -0400
++++ linux-3.3.0-4.fc17.noarch/kernel/time/timekeeping.c	2012-03-30 14:18:38.959121171 -0400
+@@ -854,13 +854,6 @@ static void timekeeping_adjust(s64 offse
+ 	} else /* No adjustment needed */
+ 		return;
+ 
+-	WARN_ONCE(timekeeper.clock->maxadj &&
+-			(timekeeper.mult + adj > timekeeper.clock->mult +
+-						timekeeper.clock->maxadj),
+-			"Adjusting %s more then 11%% (%ld vs %ld)\n",
+-			timekeeper.clock->name, (long)timekeeper.mult + adj,
+-			(long)timekeeper.clock->mult +
+-				timekeeper.clock->maxadj);
+ 	/*
+ 	 * So the following can be confusing.
+ 	 *


More information about the scm-commits mailing list