[kernel] r13992 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series

[Moritz Muehlenhoff]

Author: jmm
Date: Wed Jul 22 21:50:51 2009
New Revision: 13992

Log:
* Emit HPET warning only once to avoid syslog floods, which occur on
  some systems like HP DC7900 (Closes: #512617)

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/hpet-avoid-log-flooding.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/18

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Wed Jul 22 20:06:32 2009	(r13991)
+++ dists/lenny/linux-2.6/debian/changelog	Wed Jul 22 21:50:51 2009	(r13992)
@@ -22,6 +22,8 @@
   * ALSA: hda_intel: enable snoop for NVidia HDA controller (Closes: #521192)
   * eeepc: Fix oops when changing backlight brightness during init
     (Closes: #513406)
+  * Emit HPET warning only once to avoid syslog floods, which occur on
+    some systems like HP DC7900 (Closes: #512617)
 
   [ dann frazier ]
   * sata_nv: avoid link reset on controllers where it's broken

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/hpet-avoid-log-flooding.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/hpet-avoid-log-flooding.patch	Wed Jul 22 21:50:51 2009	(r13992)
@@ -0,0 +1,31 @@
+From: Matt Fleming <mjf at gentoo.org>
+Date: Sun, 2 Nov 2008 16:04:18 +0000 (+0000)
+Subject: x86: HPET: convert WARN_ON to WARN_ON_ONCE
+X-Git-Tag: v2.6.28-rc5~78^2~5
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-2.6.28.y.git;a=commitdiff_plain;h=1de5b0854623d30d01d72cd4ea323eb5f39d1f16
+
+x86: HPET: convert WARN_ON to WARN_ON_ONCE
+
+It is possible to flood the console with call traces if the WARN_ON
+condition is true because of the frequency with which this function is
+called.
+
+Signed-off-by: Matt Fleming <mjf at gentoo.org>
+Cc: mingo at elte.hu
+Cc: venkatesh.pallipadi at intel.com
+Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
+---
+
+diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
+index 77017e8..f10f946 100644
+--- a/arch/x86/kernel/hpet.c
++++ b/arch/x86/kernel/hpet.c
+@@ -322,7 +322,7 @@ static int hpet_next_event(unsigned long delta,
+ 	 * what we wrote hit the chip before we compare it to the
+ 	 * counter.
+ 	 */
+-	WARN_ON((u32)hpet_readl(HPET_T0_CMP) != cnt);
++	WARN_ON_ONCE((u32)hpet_readl(HPET_T0_CMP) != cnt);
+ 
+ 	return (s32)((u32)hpet_readl(HPET_COUNTER) - cnt) >= 0 ? -ETIME : 0;
+ }

Modified: dists/lenny/linux-2.6/debian/patches/series/18
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/18	Wed Jul 22 20:06:32 2009	(r13991)
+++ dists/lenny/linux-2.6/debian/patches/series/18	Wed Jul 22 21:50:51 2009	(r13992)
@@ -10,3 +10,4 @@
 + bugfix/all/add-fno-delete-null-pointer-checks-to-CFLAGS.patch
 + bugfix/all/sound-enable-snoop-for-nvidia-hda.patch
 + bugfix/all/eeepc-fix-oops-when-changing-backlight-brightness-during-init.patch
++ bugfix/all/hpet-avoid-log-flooding.patch