From 058b0767d6525a25ec51926a0e3291aefb621e3a Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Mon, 14 Nov 2011 14:26:26 -0500
Subject: [PATCH] Quite a warning in apm_cpu_idle (rhbz 753776)

WARN_ONCE is now the top thing on my "BIGGEST WASTE OF TIME" list.  It changes
daily though.
---
 kernel.spec     |  3 +++
 quite-apm.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 quite-apm.patch

diff --git a/kernel.spec b/kernel.spec
index 1b7cbaa24..12e466eec 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -672,6 +672,7 @@ Patch470: die-floppy-die.patch
 Patch471: floppy-drop-disable_hlt-warning.patch
 
 Patch510: linux-2.6-silence-noise.patch
+Patch520: quite-apm.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
 
 Patch700: linux-2.6-e1000-ich9-montevina.patch
@@ -1375,6 +1376,7 @@ ApplyPatch linux-2.6-intel-iommu-igfx.patch
 
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
+ApplyPatch quite-apm.patch
 
 # V4L/DVB updates/fixes/experimental drivers
 #  apply if non-empty
@@ -2145,6 +2147,7 @@ fi
 - Patch from Joshua Roys to add rtl8192* to modules.networking (rhbz 753645)
 - Add patch for wacom tablets for Bastien Nocera (upstream 3797ef6b6)
 - Add patch to fix ip6_tunnel naming (rhbz 751165)
+- Quite warning in apm_cpu_idle (rhbz 753776)
 
 * Mon Nov 14 2011 Josh Boyer <jwboyer@redhat.com> 3.1.1-2
 - CVE-2011-4131: nfs4_getfacl decoding kernel oops (rhbz 753236)
diff --git a/quite-apm.patch b/quite-apm.patch
new file mode 100644
index 000000000..9325ae55b
--- /dev/null
+++ b/quite-apm.patch
@@ -0,0 +1,13 @@
+diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
+index a46bd38..416dd12 100644
+--- a/arch/x86/kernel/apm_32.c
++++ b/arch/x86/kernel/apm_32.c
+@@ -903,7 +903,7 @@ static void apm_cpu_idle(void)
+ 	unsigned int jiffies_since_last_check = jiffies - last_jiffies;
+ 	unsigned int bucket;
+ 
+-	WARN_ONCE(1, "deprecated apm_cpu_idle will be deleted in 2012");
++	printk(KERN_INFO "deprecated apm_cpu_idle will be deleted in 2012");
+ recalc:
+ 	if (jiffies_since_last_check > IDLE_CALC_LIMIT) {
+ 		use_apm_idle = 0;