summaryrefslogtreecommitdiffstats
path: root/quiet-apm.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-02-21 08:44:42 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-02-21 08:45:44 -0500
commit3704ea2fb1d4e7403882e727b2223c999e78d73a (patch)
treef6b6de6cea51c779c38dc67bea3dad540f5867cf /quiet-apm.patch
parent7da15bc1bbefeafa118ebaecdea5ab0af33e5b40 (diff)
downloadkernel-3704ea2fb1d4e7403882e727b2223c999e78d73a.tar.gz
kernel-3704ea2fb1d4e7403882e727b2223c999e78d73a.tar.xz
kernel-3704ea2fb1d4e7403882e727b2223c999e78d73a.zip
Linux v3.8-523-gece8e0b
- Reenable debugging options.
Diffstat (limited to 'quiet-apm.patch')
-rw-r--r--quiet-apm.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/quiet-apm.patch b/quiet-apm.patch
index c38511c41..a302b4ecd 100644
--- a/quiet-apm.patch
+++ b/quiet-apm.patch
@@ -1,13 +1,13 @@
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
-index a46bd38..416dd12 100644
+index 8d7012b..eb9d320 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)
+@@ -905,7 +905,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_once(KERN_INFO "deprecated apm_cpu_idle will be deleted in 2012");
recalc:
+ task_cputime(current, NULL, &stime);
if (jiffies_since_last_check > IDLE_CALC_LIMIT) {
- use_apm_idle = 0;