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

This commit is contained in:
Dave Jones 2012-03-30 14:20:38 -04:00
parent 9abfa16136
commit e9cafbfe1a
2 changed files with 23 additions and 0 deletions

View File

@ -663,7 +663,9 @@ Patch470: die-floppy-die.patch
Patch471: floppy-Remove-_hlt-related-functions.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
Patch700: linux-2.6-e1000-ich9-montevina.patch
@ -1411,6 +1413,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
@ -2374,6 +2378,9 @@ fi
# '-' | |
# '-'
%changelog
* Fri Mar 30 2012 Dave Jones <davej@redhat.com>
- Silence the timekeeping "Adjusting tsc more then 11%" spew. (rhbz 798600)
* Fri Mar 30 2012 Josh Boyer <jwboyer@redhat.com>
- Fix i915 fbdev cursor blink around suspend/hibernate from Dave Airlied
- CVE-2012-1601: kvm: NULL dereference from irqchip_in_kernel and

View File

@ -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.
*