summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel.spec3
-rw-r--r--quite-apm.patch13
2 files changed, 16 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 829552e65..4755b8988 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -645,6 +645,7 @@ Patch470: die-floppy-die.patch
Patch471: floppy-Remove-_hlt-related-functions.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
@@ -1319,6 +1320,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
@@ -2068,6 +2070,7 @@ fi
* Mon Nov 14 2011 Josh Boyer <jwboyer@redhat.com>
- Patch from Joshua Roys to add rtl8192* to modules.networking (rhbz 753645)
- 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>
- 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;