diff options
-rw-r--r-- | kernel.spec | 5 | ||||
-rw-r--r-- | quite-apm.patch | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index d11719ffa..d0d0d6783 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2213,6 +2213,9 @@ fi # ||----w | # || || %changelog +* Mon Dec 05 2011 Josh Boyer <jwboyer@redhat.com> +- Only print the apm_cpu_idle message once (rhbz #760341) + * Mon Dec 05 2011 Dave Jones <davej@redhat.com> - Enable CONFIG_BSD_ACCT_V3. Should be safe since psacct-6.5.4-4.fc14. diff --git a/quite-apm.patch b/quite-apm.patch index 9325ae55b..c38511c41 100644 --- a/quite-apm.patch +++ b/quite-apm.patch @@ -7,7 +7,7 @@ index a46bd38..416dd12 100644 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"); ++ printk_once(KERN_INFO "deprecated apm_cpu_idle will be deleted in 2012"); recalc: if (jiffies_since_last_check > IDLE_CALC_LIMIT) { use_apm_idle = 0; |