From 915f8c1fee0d8af340c781479034b2b4773e31c0 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Sat, 15 Jul 2006 12:29:56 +0000 Subject: [PATCH] Make powernow-k7 work on SMP kernels (Dave Jones). svn path=/dists/sid/linux-2.6.16/; revision=7012 --- debian/changelog | 1 + debian/patches/powernow-k7.patch | 28 ++++++++++++++++++++++++++++ debian/patches/series/17 | 1 + 3 files changed, 30 insertions(+) create mode 100644 debian/patches/powernow-k7.patch diff --git a/debian/changelog b/debian/changelog index 8abcbff72..e3aba2745 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ linux-2.6.16 (2.6.16-17) UNRELEASED; urgency=high * [arm/nslu2] Unset CONFIG_USB_STORAGE_DEBUG. Closes: #377853. * [mips] SGI ip22 RTC was broken, fixed thanks to Julien Blache. * [mips] Fix SGI ip22 serial console, thanks to Julien Blache. + * [i386] Make powernow-k7 work on SMP kernels (Dave Jones). -- Martin Michlmayr Fri, 14 Jul 2006 01:00:57 +0200 diff --git a/debian/patches/powernow-k7.patch b/debian/patches/powernow-k7.patch new file mode 100644 index 000000000..36e25e7cd --- /dev/null +++ b/debian/patches/powernow-k7.patch @@ -0,0 +1,28 @@ +commit 436fe7b8b4a5016ef1fcb32bff77bde84003e15d +Author: Dave Jones +Date: Mon Jun 5 14:03:50 2006 -0400 + + [CPUFREQ] Make powernow-k7 work on SMP kernels. + Even though powernow-k7 doesn't work in SMP environments, + it can work on an SMP configured kernel if there's only + one CPU present, however recalibrate_cpu_khz was returning + -EINVAL on such kernels, so we failed to init the cpufreq driver. + + Signed-off-by: Dave Jones + +diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c +index 5d2b601..694d479 100644 +--- a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c ++++ b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c +@@ -581,10 +581,7 @@ static int __init powernow_cpu_init (str + + rdmsrl (MSR_K7_FID_VID_STATUS, fidvidstatus.val); + +- /* recalibrate cpu_khz */ +- result = recalibrate_cpu_khz(); +- if (result) +- return result; ++ recalibrate_cpu_khz(); + + fsb = (10 * cpu_khz) / fid_codes[fidvidstatus.bits.CFID]; + if (!fsb) { diff --git a/debian/patches/series/17 b/debian/patches/series/17 index 0ff0469a8..b9d3bc02b 100644 --- a/debian/patches/series/17 +++ b/debian/patches/series/17 @@ -6,3 +6,4 @@ + mips-ip22-serial-fix.patch + 2.6.16.25 + relax-proc-fix.patch ++ powernow-k7.patch