From 19ac3d26c10db9ea13c40f752032ef053922df66 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 3 Nov 2009 02:16:20 +0000 Subject: [PATCH] [powerpc] Remove SMP warning from PowerMac cpufreq (Closes: #554124). Logged under Bastian's name since the patch is from him. svn path=/dists/sid/linux-2.6/; revision=14534 --- debian/changelog | 3 ++ ...ve-SMP-warning-from-PowerMac-cpufreq.patch | 50 +++++++++++++++++++ debian/patches/series/2 | 1 + 3 files changed, 54 insertions(+) create mode 100644 debian/patches/bugfix/powerpc/Remove-SMP-warning-from-PowerMac-cpufreq.patch diff --git a/debian/changelog b/debian/changelog index 244243b3b..9a13b13d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ linux-2.6 (2.6.31-2) UNRELEASED; urgency=low [ Ben Hutchings ] * postinst: Accept absolute paths in modules.dep generated by the lenny version of module-init-tools (Closes: #552610) + + [ Bastian Blank ] + * [powerpc] Remove SMP warning from PowerMac cpufreq (Closes: #554124) -- Martin Michlmayr Tue, 27 Oct 2009 21:18:29 +0800 diff --git a/debian/patches/bugfix/powerpc/Remove-SMP-warning-from-PowerMac-cpufreq.patch b/debian/patches/bugfix/powerpc/Remove-SMP-warning-from-PowerMac-cpufreq.patch new file mode 100644 index 000000000..78a23d45e --- /dev/null +++ b/debian/patches/bugfix/powerpc/Remove-SMP-warning-from-PowerMac-cpufreq.patch @@ -0,0 +1,50 @@ +From 6fdc31a2b86cf1f98e3eed896578ad9659eeb0f8 Mon Sep 17 00:00:00 2001 +From: Bastian Blank +Date: Wed, 12 Aug 2009 23:30:45 +0000 +Subject: [PATCH] powerpc: Remove SMP warning from PowerMac cpufreq + +On Thu, Aug 13, 2009 at 04:14:58PM +1000, Benjamin Herrenschmidt wrote: +> On Tue, 2009-08-11 at 11:39 +0200, Bastian Blank wrote: +> > This patch just disables this driver on SMP kernels, as it is obviously +> > not supported. +> Why not remove the #error instead ? :-) I don't think it's still +> meaningful, especially since we use the timebase for delays nowadays +> which doesn't depend on the CPU frequency... + +Your call. Take this one: + +The build of a PowerMac 32bit kernel currently fails with + +error: #warning "WARNING, CPUFREQ not recommended on SMP kernels" + +Thie patch removes the not longer applicable SMP warning from the +PowerMac cpufreq code. + +Signed-off-by: Bastian Blank +Signed-off-by: Benjamin Herrenschmidt +--- + arch/powerpc/platforms/powermac/cpufreq_32.c | 8 -------- + 1 files changed, 0 insertions(+), 8 deletions(-) + +diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c +index 65c585b..08d94e4 100644 +--- a/arch/powerpc/platforms/powermac/cpufreq_32.c ++++ b/arch/powerpc/platforms/powermac/cpufreq_32.c +@@ -44,14 +44,6 @@ + */ + #undef DEBUG_FREQ + +-/* +- * There is a problem with the core cpufreq code on SMP kernels, +- * it won't recalculate the Bogomips properly +- */ +-#ifdef CONFIG_SMP +-#warning "WARNING, CPUFREQ not recommended on SMP kernels" +-#endif +- + extern void low_choose_7447a_dfs(int dfs); + extern void low_choose_750fx_pll(int pll); + extern void low_sleep_handler(void); +-- +1.6.5.2 + diff --git a/debian/patches/series/2 b/debian/patches/series/2 index cd4b192f2..3171a43a4 100644 --- a/debian/patches/series/2 +++ b/debian/patches/series/2 @@ -1,2 +1,3 @@ + bugfix/mips/fix-build-vmlinuxlds.patch + features/arm/openrd-client.patch ++ bugfix/powerpc/Remove-SMP-warning-from-PowerMac-cpufreq.patch