From patchwork Thu Jan 28 06:28:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Miao X-Patchwork-Id: 43849 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 96553B7CFB for ; Thu, 28 Jan 2010 17:28:58 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NaNrz-00075R-1j; Thu, 28 Jan 2010 06:28:47 +0000 Received: from mail-qy0-f183.google.com ([209.85.221.183]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NaNrx-00074d-N3 for kernel-team@lists.ubuntu.com; Thu, 28 Jan 2010 06:28:45 +0000 Received: by qyk13 with SMTP id 13so213139qyk.31 for ; Wed, 27 Jan 2010 22:28:45 -0800 (PST) MIME-Version: 1.0 Received: by 10.229.128.165 with SMTP id k37mr5576869qcs.53.1264660124903; Wed, 27 Jan 2010 22:28:44 -0800 (PST) From: Eric Miao Date: Thu, 28 Jan 2010 14:28:24 +0800 X-Google-Sender-Auth: 98fe2a7275a339c2 Message-ID: Subject: [GIT PULL] [lucid] mvl-dove: Enable CPUFREQ by default To: Andy Whitcroft Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com The following changes since commit 46edf937c731f048b60d4ceeaa15bdd91e721b3e: Andy Whitcroft (1): UBUNTU: Ubuntu-2.6.32-200.5 are available in the git repository at: git://kernel.ubuntu.com/ycmiao/ubuntu-lucid.git lp513254 Eric Miao (1): UBUNTU: SAUCE: Enable CPUFREQ by default arch/arm/mach-dove/common.c | 8 ++++---- arch/arm/mach-dove/cpufreq.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) ============= PATCH FOLLOWS ============= commit efcd307a23636b25828dffc6224a788df0bb96d0 Author: Eric Miao Date: Wed Jan 27 21:55:13 2010 +0800 UBUNTU: SAUCE: Enable CPUFREQ by default BugLink: http://bugs.launchpad.net/bugs/513254 CPUFREQ isn't enabled even if the support is compiled in, unless turned on explicitly in command line by 'cpufreq_enable'. Change the option to 'cpufreq_disable' so user can still turn this off in command line, but make CPUFREQ enabled by default. Signed-off-by: Eric Miao diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index 903cf36..f7d808b 100755 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c @@ -169,14 +169,14 @@ static int __init pm_disable_setup(char *__unused) __setup("pm_disable", pm_disable_setup); -int cpufreq_enable = 0; -static int __init cpufreq_enable_setup(char *__unused) +int cpufreq_disable = 0; +static int __init cpufreq_disable_setup(char *__unused) { - cpufreq_enable = 1; + cpufreq_disable = 1; return 1; } -__setup("cpufreq_enable", cpufreq_enable_setup); +__setup("cpufreq_disable", cpufreq_disable_setup); int dvs_enable = 0; static int __init dvs_enable_setup(char *__unused) diff --git a/arch/arm/mach-dove/cpufreq.c b/arch/arm/mach-dove/cpufreq.c index 5bb4df5..4408c91 100644 --- a/arch/arm/mach-dove/cpufreq.c +++ b/arch/arm/mach-dove/cpufreq.c @@ -292,11 +292,11 @@ static struct cpufreq_driver dove_freq_driver = { .attr = dove_freq_attr, }; -extern int cpufreq_enable; +extern int cpufreq_disable; static int __init dove_cpufreq_init(void) { - if (!cpufreq_enable) + if (cpufreq_disable) return 0; return cpufreq_register_driver(&dove_freq_driver); @@ -304,7 +304,7 @@ static int __init dove_cpufreq_init(void) static void __exit dove_cpufreq_exit(void) { - if (!cpufreq_enable) + if (cpufreq_disable) return; cpufreq_unregister_driver(&dove_freq_driver);