From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 05 Jan 2017 10:50:49 +0100 (CET) Received: from mail.free-electrons.com ([62.4.15.54]:42561 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S23992143AbdAEJulkOu8B (ORCPT ); Thu, 5 Jan 2017 10:50:41 +0100 Received: by mail.free-electrons.com (Postfix, from userid 110) id 361382070E; Thu, 5 Jan 2017 10:50:38 +0100 (CET) Received: from localhost (83.146.29.93.rev.sfr.net [93.29.146.83]) by mail.free-electrons.com (Postfix) with ESMTPSA id 044D22041F; Thu, 5 Jan 2017 10:50:27 +0100 (CET) From: Gregory CLEMENT To: Viresh Kumar Cc: Rafael Wysocki , Kukjin Kim , Krzysztof Kozlowski , Javier Martinez Canillas , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Simon Horman , Magnus Damm , linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Vincent Guittot , arnd.bergmann@linaro.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org Subject: Re: [PATCH] cpufreq: Remove CONFIG_CPU_FREQ_STAT_DETAILS config option References: Date: Thu, 05 Jan 2017 10:50:25 +0100 In-Reply-To: (Viresh Kumar's message of "Thu, 5 Jan 2017 13:57:41 +0530") Message-ID: <877f69esym.fsf@free-electrons.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 56164 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: gregory.clement@free-electrons.com Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips Hi Viresh, On jeu., janv. 05 2017, Viresh Kumar wrote: > This doesn't have any benefit apart from saving a small amount of memory > when it is disabled. The ifdef hackery in the code makes it dirty > unnecessarily. > > Clean it up by removing the Kconfig option completely. Few defconfigs > are also updated and CONFIG_CPU_FREQ_STAT_DETAILS is replaced with > CONFIG_CPU_FREQ_STAT now in them, as users wanted stats to be enabled. > > Signed-off-by: Viresh Kumar > --- > arch/arm/configs/exynos_defconfig | 2 +- > arch/arm/configs/multi_v5_defconfig | 2 +- > arch/arm/configs/multi_v7_defconfig | 2 +- > arch/arm/configs/mvebu_v5_defconfig | 2 +- For this file: Acked-by: Gregory CLEMENT Gregory > arch/arm/configs/pxa_defconfig | 2 +- > arch/arm/configs/shmobile_defconfig | 2 +- > arch/mips/configs/lemote2f_defconfig | 1 - > arch/powerpc/configs/ppc6xx_defconfig | 1 - > arch/sh/configs/sh7785lcr_32bit_defconfig | 2 +- > drivers/cpufreq/Kconfig | 8 -------- > drivers/cpufreq/cpufreq_stats.c | 14 -------------- > 11 files changed, 7 insertions(+), 31 deletions(-) > > diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig > index 79c415c33f69..809f0bf3042a 100644 > --- a/arch/arm/configs/exynos_defconfig > +++ b/arch/arm/configs/exynos_defconfig > @@ -24,7 +24,7 @@ CONFIG_ARM_APPENDED_DTB=y > CONFIG_ARM_ATAG_DTB_COMPAT=y > CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M" > CONFIG_CPU_FREQ=y > -CONFIG_CPU_FREQ_STAT_DETAILS=y > +CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=m > CONFIG_CPU_FREQ_GOV_USERSPACE=m > diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig > index 361686a362f1..69a4bd13eea5 100644 > --- a/arch/arm/configs/multi_v5_defconfig > +++ b/arch/arm/configs/multi_v5_defconfig > @@ -58,7 +58,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 > CONFIG_ARM_APPENDED_DTB=y > CONFIG_ARM_ATAG_DTB_COMPAT=y > CONFIG_CPU_FREQ=y > -CONFIG_CPU_FREQ_STAT_DETAILS=y > +CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_CPU_IDLE=y > CONFIG_ARM_KIRKWOOD_CPUIDLE=y > diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig > index b01a43851294..2dcac90eba01 100644 > --- a/arch/arm/configs/multi_v7_defconfig > +++ b/arch/arm/configs/multi_v7_defconfig > @@ -132,7 +132,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y > CONFIG_KEXEC=y > CONFIG_EFI=y > CONFIG_CPU_FREQ=y > -CONFIG_CPU_FREQ_STAT_DETAILS=y > +CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=m > CONFIG_CPU_FREQ_GOV_USERSPACE=m > diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig > index f7f6039419aa..4b598da0d086 100644 > --- a/arch/arm/configs/mvebu_v5_defconfig > +++ b/arch/arm/configs/mvebu_v5_defconfig > @@ -44,7 +44,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 > CONFIG_ARM_APPENDED_DTB=y > CONFIG_ARM_ATAG_DTB_COMPAT=y > CONFIG_CPU_FREQ=y > -CONFIG_CPU_FREQ_STAT_DETAILS=y > +CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_CPU_IDLE=y > CONFIG_ARM_KIRKWOOD_CPUIDLE=y > diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig > index e4314b1227a3..271dc7e78e43 100644 > --- a/arch/arm/configs/pxa_defconfig > +++ b/arch/arm/configs/pxa_defconfig > @@ -97,7 +97,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 > CONFIG_CMDLINE="root=/dev/ram0 ro" > CONFIG_KEXEC=y > CONFIG_CPU_FREQ=y > -CONFIG_CPU_FREQ_STAT_DETAILS=y > +CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=m > CONFIG_CPU_FREQ_GOV_USERSPACE=m > diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig > index 1b0f8ae36fb3..adeaecd831a4 100644 > --- a/arch/arm/configs/shmobile_defconfig > +++ b/arch/arm/configs/shmobile_defconfig > @@ -38,7 +38,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 > CONFIG_ARM_APPENDED_DTB=y > CONFIG_KEXEC=y > CONFIG_CPU_FREQ=y > -CONFIG_CPU_FREQ_STAT_DETAILS=y > +CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=y > CONFIG_CPU_FREQ_GOV_USERSPACE=y > CONFIG_CPU_FREQ_GOV_ONDEMAND=y > diff --git a/arch/mips/configs/lemote2f_defconfig b/arch/mips/configs/lemote2f_defconfig > index 5da76e0e120f..bed745596d86 100644 > --- a/arch/mips/configs/lemote2f_defconfig > +++ b/arch/mips/configs/lemote2f_defconfig > @@ -40,7 +40,6 @@ CONFIG_PM_STD_PARTITION="/dev/hda3" > CONFIG_CPU_FREQ=y > CONFIG_CPU_FREQ_DEBUG=y > CONFIG_CPU_FREQ_STAT=m > -CONFIG_CPU_FREQ_STAT_DETAILS=y > CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=m > CONFIG_CPU_FREQ_GOV_USERSPACE=m > diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig > index 3ce91a3df27f..1d2d69dd6409 100644 > --- a/arch/powerpc/configs/ppc6xx_defconfig > +++ b/arch/powerpc/configs/ppc6xx_defconfig > @@ -62,7 +62,6 @@ CONFIG_MPC8610_HPCD=y > CONFIG_GEF_SBC610=y > CONFIG_CPU_FREQ=y > CONFIG_CPU_FREQ_STAT=m > -CONFIG_CPU_FREQ_STAT_DETAILS=y > CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y > CONFIG_CPU_FREQ_GOV_PERFORMANCE=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=m > diff --git a/arch/sh/configs/sh7785lcr_32bit_defconfig b/arch/sh/configs/sh7785lcr_32bit_defconfig > index 9bdcf72ec06a..2fce54d9c388 100644 > --- a/arch/sh/configs/sh7785lcr_32bit_defconfig > +++ b/arch/sh/configs/sh7785lcr_32bit_defconfig > @@ -25,7 +25,7 @@ CONFIG_SH_SH7785LCR=y > CONFIG_NO_HZ=y > CONFIG_HIGH_RES_TIMERS=y > CONFIG_CPU_FREQ=y > -CONFIG_CPU_FREQ_STAT_DETAILS=y > +CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_SH_CPU_FREQ=y > CONFIG_HEARTBEAT=y > diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig > index d8b164a7c4e5..15adef473d42 100644 > --- a/drivers/cpufreq/Kconfig > +++ b/drivers/cpufreq/Kconfig > @@ -37,14 +37,6 @@ config CPU_FREQ_STAT > > If in doubt, say N. > > -config CPU_FREQ_STAT_DETAILS > - bool "CPU frequency transition statistics details" > - depends on CPU_FREQ_STAT > - help > - Show detailed CPU frequency transition table in sysfs. > - > - If in doubt, say N. > - > choice > prompt "Default CPUFreq governor" > default CPU_FREQ_DEFAULT_GOV_USERSPACE if ARM_SA1100_CPUFREQ || ARM_SA1110_CPUFREQ > diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c > index ac284e66839c..18abd454da43 100644 > --- a/drivers/cpufreq/cpufreq_stats.c > +++ b/drivers/cpufreq/cpufreq_stats.c > @@ -25,9 +25,7 @@ struct cpufreq_stats { > unsigned int last_index; > u64 *time_in_state; > unsigned int *freq_table; > -#ifdef CONFIG_CPU_FREQ_STAT_DETAILS > unsigned int *trans_table; > -#endif > }; > > static int cpufreq_stats_update(struct cpufreq_stats *stats) > @@ -46,9 +44,7 @@ static void cpufreq_stats_clear_table(struct cpufreq_stats *stats) > unsigned int count = stats->max_state; > > memset(stats->time_in_state, 0, count * sizeof(u64)); > -#ifdef CONFIG_CPU_FREQ_STAT_DETAILS > memset(stats->trans_table, 0, count * count * sizeof(int)); > -#endif > stats->last_time = get_jiffies_64(); > stats->total_trans = 0; > } > @@ -84,7 +80,6 @@ static ssize_t store_reset(struct cpufreq_policy *policy, const char *buf, > return count; > } > > -#ifdef CONFIG_CPU_FREQ_STAT_DETAILS > static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf) > { > struct cpufreq_stats *stats = policy->stats; > @@ -129,7 +124,6 @@ static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf) > return len; > } > cpufreq_freq_attr_ro(trans_table); > -#endif > > cpufreq_freq_attr_ro(total_trans); > cpufreq_freq_attr_ro(time_in_state); > @@ -139,9 +133,7 @@ static struct attribute *default_attrs[] = { > &total_trans.attr, > &time_in_state.attr, > &reset.attr, > -#ifdef CONFIG_CPU_FREQ_STAT_DETAILS > &trans_table.attr, > -#endif > NULL > }; > static struct attribute_group stats_attr_group = { > @@ -200,9 +192,7 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy) > > alloc_size = count * sizeof(int) + count * sizeof(u64); > > -#ifdef CONFIG_CPU_FREQ_STAT_DETAILS > alloc_size += count * count * sizeof(int); > -#endif > > /* Allocate memory for time_in_state/freq_table/trans_table in one go */ > stats->time_in_state = kzalloc(alloc_size, GFP_KERNEL); > @@ -211,9 +201,7 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy) > > stats->freq_table = (unsigned int *)(stats->time_in_state + count); > > -#ifdef CONFIG_CPU_FREQ_STAT_DETAILS > stats->trans_table = stats->freq_table + count; > -#endif > > stats->max_state = count; > > @@ -259,8 +247,6 @@ void cpufreq_stats_record_transition(struct cpufreq_policy *policy, > cpufreq_stats_update(stats); > > stats->last_index = new_index; > -#ifdef CONFIG_CPU_FREQ_STAT_DETAILS > stats->trans_table[old_index * stats->max_state + new_index]++; > -#endif > stats->total_trans++; > } > -- > 2.7.1.410.g6faf27b > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gregory CLEMENT Date: Thu, 05 Jan 2017 09:50:25 +0000 Subject: Re: [PATCH] cpufreq: Remove CONFIG_CPU_FREQ_STAT_DETAILS config option Message-Id: <877f69esym.fsf@free-electrons.com> List-Id: References: In-Reply-To: (Viresh Kumar's message of "Thu, 5 Jan 2017 13:57:41 +0530") MIME-Version: 1.0 Content-Type: text/plain; charset="windows-1254" Content-Transfer-Encoding: base64 To: linux-arm-kernel@lists.infradead.org SGkgVmlyZXNoLAogCiBPbiBqZXUuLCBqYW52LiAwNSAyMDE3LCBWaXJlc2ggS3VtYXIgPHZpcmVz aC5rdW1hckBsaW5hcm8ub3JnPiB3cm90ZToKCj4gVGhpcyBkb2Vzbid0IGhhdmUgYW55IGJlbmVm aXQgYXBhcnQgZnJvbSBzYXZpbmcgYSBzbWFsbCBhbW91bnQgb2YgbWVtb3J5Cj4gd2hlbiBpdCBp cyBkaXNhYmxlZC4gVGhlIGlmZGVmIGhhY2tlcnkgaW4gdGhlIGNvZGUgbWFrZXMgaXQgZGlydHkK PiB1bm5lY2Vzc2FyaWx5Lgo+Cj4gQ2xlYW4gaXQgdXAgYnkgcmVtb3ZpbmcgdGhlIEtjb25maWcg b3B0aW9uIGNvbXBsZXRlbHkuIEZldyBkZWZjb25maWdzCj4gYXJlIGFsc28gdXBkYXRlZCBhbmQg Q09ORklHX0NQVV9GUkVRX1NUQVRfREVUQUlMUyBpcyByZXBsYWNlZCB3aXRoCj4gQ09ORklHX0NQ VV9GUkVRX1NUQVQgbm93IGluIHRoZW0sIGFzIHVzZXJzIHdhbnRlZCBzdGF0cyB0byBiZSBlbmFi bGVkLgo+Cj4gU2lnbmVkLW9mZi1ieTogVmlyZXNoIEt1bWFyIDx2aXJlc2gua3VtYXJAbGluYXJv Lm9yZz4KPiAtLS0KPiAgYXJjaC9hcm0vY29uZmlncy9leHlub3NfZGVmY29uZmlnICAgICAgICAg fCAgMiArLQo+ICBhcmNoL2FybS9jb25maWdzL211bHRpX3Y1X2RlZmNvbmZpZyAgICAgICB8ICAy ICstCj4gIGFyY2gvYXJtL2NvbmZpZ3MvbXVsdGlfdjdfZGVmY29uZmlnICAgICAgIHwgIDIgKy0K Cj4gIGFyY2gvYXJtL2NvbmZpZ3MvbXZlYnVfdjVfZGVmY29uZmlnICAgICAgIHwgIDIgKy0KRm9y IHRoaXMgZmlsZToKCkFja2VkLWJ5OiBHcmVnb3J5IENMRU1FTlQgPGdyZWdvcnkuY2xlbWVudEBm cmVlLWVsZWN0cm9ucy5jb20+CgpHcmVnb3J5CgoKPiAgYXJjaC9hcm0vY29uZmlncy9weGFfZGVm Y29uZmlnICAgICAgICAgICAgfCAgMiArLQo+ICBhcmNoL2FybS9jb25maWdzL3NobW9iaWxlX2Rl ZmNvbmZpZyAgICAgICB8ICAyICstCj4gIGFyY2gvbWlwcy9jb25maWdzL2xlbW90ZTJmX2RlZmNv bmZpZyAgICAgIHwgIDEgLQo+ICBhcmNoL3Bvd2VycGMvY29uZmlncy9wcGM2eHhfZGVmY29uZmln ICAgICB8ICAxIC0KPiAgYXJjaC9zaC9jb25maWdzL3NoNzc4NWxjcl8zMmJpdF9kZWZjb25maWcg fCAgMiArLQo+ICBkcml2ZXJzL2NwdWZyZXEvS2NvbmZpZyAgICAgICAgICAgICAgICAgICB8ICA4 IC0tLS0tLS0tCj4gIGRyaXZlcnMvY3B1ZnJlcS9jcHVmcmVxX3N0YXRzLmMgICAgICAgICAgIHwg MTQgLS0tLS0tLS0tLS0tLS0KPiAgMTEgZmlsZXMgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCAz MSBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9hcmNoL2FybS9jb25maWdzL2V4eW5vc19k ZWZjb25maWcgYi9hcmNoL2FybS9jb25maWdzL2V4eW5vc19kZWZjb25maWcKPiBpbmRleCA3OWM0 MTVjMzNmNjkuLjgwOWYwYmYzMDQyYSAxMDA2NDQKPiAtLS0gYS9hcmNoL2FybS9jb25maWdzL2V4 eW5vc19kZWZjb25maWcKPiArKysgYi9hcmNoL2FybS9jb25maWdzL2V4eW5vc19kZWZjb25maWcK PiBAQCAtMjQsNyArMjQsNyBAQCBDT05GSUdfQVJNX0FQUEVOREVEX0RUQj15Cj4gIENPTkZJR19B Uk1fQVRBR19EVEJfQ09NUEFUPXkKPiAgQ09ORklHX0NNRExJTkU9InJvb3Q9L2Rldi9yYW0wIHJ3 IHJhbWRpc2uBOTIgaW5pdHJkPTB4NDEwMDAwMDAsOE0gY29uc29sZT10dHlTQUMxLDExNTIwMCBp bml0PS9saW51eHJjIG1lbSU2TSIKPiAgQ09ORklHX0NQVV9GUkVRPXkKPiAtQ09ORklHX0NQVV9G UkVRX1NUQVRfREVUQUlMUz15Cj4gK0NPTkZJR19DUFVfRlJFUV9TVEFUPXkKPiAgQ09ORklHX0NQ VV9GUkVRX0RFRkFVTFRfR09WX09OREVNQU5EPXkKPiAgQ09ORklHX0NQVV9GUkVRX0dPVl9QT1dF UlNBVkU9bQo+ICBDT05GSUdfQ1BVX0ZSRVFfR09WX1VTRVJTUEFDRT1tCj4gZGlmZiAtLWdpdCBh L2FyY2gvYXJtL2NvbmZpZ3MvbXVsdGlfdjVfZGVmY29uZmlnIGIvYXJjaC9hcm0vY29uZmlncy9t dWx0aV92NV9kZWZjb25maWcKPiBpbmRleCAzNjE2ODZhMzYyZjEuLjY5YTRiZDEzZWVhNSAxMDA2 NDQKPiAtLS0gYS9hcmNoL2FybS9jb25maWdzL211bHRpX3Y1X2RlZmNvbmZpZwo+ICsrKyBiL2Fy Y2gvYXJtL2NvbmZpZ3MvbXVsdGlfdjVfZGVmY29uZmlnCj4gQEAgLTU4LDcgKzU4LDcgQEAgQ09O RklHX1pCT09UX1JPTV9CU1M9MHgwCj4gIENPTkZJR19BUk1fQVBQRU5ERURfRFRCPXkKPiAgQ09O RklHX0FSTV9BVEFHX0RUQl9DT01QQVQ9eQo+ICBDT05GSUdfQ1BVX0ZSRVE9eQo+IC1DT05GSUdf Q1BVX0ZSRVFfU1RBVF9ERVRBSUxTPXkKPiArQ09ORklHX0NQVV9GUkVRX1NUQVQ9eQo+ICBDT05G SUdfQ1BVX0ZSRVFfREVGQVVMVF9HT1ZfT05ERU1BTkQ9eQo+ICBDT05GSUdfQ1BVX0lETEU9eQo+ ICBDT05GSUdfQVJNX0tJUktXT09EX0NQVUlETEU9eQo+IGRpZmYgLS1naXQgYS9hcmNoL2FybS9j b25maWdzL211bHRpX3Y3X2RlZmNvbmZpZyBiL2FyY2gvYXJtL2NvbmZpZ3MvbXVsdGlfdjdfZGVm Y29uZmlnCj4gaW5kZXggYjAxYTQzODUxMjk0Li4yZGNhYzkwZWJhMDEgMTAwNjQ0Cj4gLS0tIGEv YXJjaC9hcm0vY29uZmlncy9tdWx0aV92N19kZWZjb25maWcKPiArKysgYi9hcmNoL2FybS9jb25m aWdzL211bHRpX3Y3X2RlZmNvbmZpZwo+IEBAIC0xMzIsNyArMTMyLDcgQEAgQ09ORklHX0FSTV9B VEFHX0RUQl9DT01QQVQ9eQo+ICBDT05GSUdfS0VYRUM9eQo+ICBDT05GSUdfRUZJPXkKPiAgQ09O RklHX0NQVV9GUkVRPXkKPiAtQ09ORklHX0NQVV9GUkVRX1NUQVRfREVUQUlMUz15Cj4gK0NPTkZJ R19DUFVfRlJFUV9TVEFUPXkKPiAgQ09ORklHX0NQVV9GUkVRX0RFRkFVTFRfR09WX09OREVNQU5E PXkKPiAgQ09ORklHX0NQVV9GUkVRX0dPVl9QT1dFUlNBVkU9bQo+ICBDT05GSUdfQ1BVX0ZSRVFf R09WX1VTRVJTUEFDRT1tCj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL2NvbmZpZ3MvbXZlYnVfdjVf ZGVmY29uZmlnIGIvYXJjaC9hcm0vY29uZmlncy9tdmVidV92NV9kZWZjb25maWcKPiBpbmRleCBm N2Y2MDM5NDE5YWEuLjRiNTk4ZGEwZDA4NiAxMDA2NDQKPiAtLS0gYS9hcmNoL2FybS9jb25maWdz L212ZWJ1X3Y1X2RlZmNvbmZpZwo+ICsrKyBiL2FyY2gvYXJtL2NvbmZpZ3MvbXZlYnVfdjVfZGVm Y29uZmlnCj4gQEAgLTQ0LDcgKzQ0LDcgQEAgQ09ORklHX1pCT09UX1JPTV9CU1M9MHgwCj4gIENP TkZJR19BUk1fQVBQRU5ERURfRFRCPXkKPiAgQ09ORklHX0FSTV9BVEFHX0RUQl9DT01QQVQ9eQo+ ICBDT05GSUdfQ1BVX0ZSRVE9eQo+IC1DT05GSUdfQ1BVX0ZSRVFfU1RBVF9ERVRBSUxTPXkKPiAr Q09ORklHX0NQVV9GUkVRX1NUQVQ9eQo+ICBDT05GSUdfQ1BVX0ZSRVFfREVGQVVMVF9HT1ZfT05E RU1BTkQ9eQo+ICBDT05GSUdfQ1BVX0lETEU9eQo+ICBDT05GSUdfQVJNX0tJUktXT09EX0NQVUlE TEU9eQo+IGRpZmYgLS1naXQgYS9hcmNoL2FybS9jb25maWdzL3B4YV9kZWZjb25maWcgYi9hcmNo L2FybS9jb25maWdzL3B4YV9kZWZjb25maWcKPiBpbmRleCBlNDMxNGIxMjI3YTMuLjI3MWRjN2U3 OGU0MyAxMDA2NDQKPiAtLS0gYS9hcmNoL2FybS9jb25maWdzL3B4YV9kZWZjb25maWcKPiArKysg Yi9hcmNoL2FybS9jb25maWdzL3B4YV9kZWZjb25maWcKPiBAQCAtOTcsNyArOTcsNyBAQCBDT05G SUdfWkJPT1RfUk9NX0JTUz0weDAKPiAgQ09ORklHX0NNRExJTkU9InJvb3Q9L2Rldi9yYW0wIHJv Igo+ICBDT05GSUdfS0VYRUM9eQo+ICBDT05GSUdfQ1BVX0ZSRVE9eQo+IC1DT05GSUdfQ1BVX0ZS RVFfU1RBVF9ERVRBSUxTPXkKPiArQ09ORklHX0NQVV9GUkVRX1NUQVQ9eQo+ICBDT05GSUdfQ1BV X0ZSRVFfREVGQVVMVF9HT1ZfT05ERU1BTkQ9eQo+ICBDT05GSUdfQ1BVX0ZSRVFfR09WX1BPV0VS U0FWRT1tCj4gIENPTkZJR19DUFVfRlJFUV9HT1ZfVVNFUlNQQUNFPW0KPiBkaWZmIC0tZ2l0IGEv YXJjaC9hcm0vY29uZmlncy9zaG1vYmlsZV9kZWZjb25maWcgYi9hcmNoL2FybS9jb25maWdzL3No bW9iaWxlX2RlZmNvbmZpZwo+IGluZGV4IDFiMGY4YWUzNmZiMy4uYWRlYWVjZDgzMWE0IDEwMDY0 NAo+IC0tLSBhL2FyY2gvYXJtL2NvbmZpZ3Mvc2htb2JpbGVfZGVmY29uZmlnCj4gKysrIGIvYXJj aC9hcm0vY29uZmlncy9zaG1vYmlsZV9kZWZjb25maWcKPiBAQCAtMzgsNyArMzgsNyBAQCBDT05G SUdfWkJPT1RfUk9NX0JTUz0weDAKPiAgQ09ORklHX0FSTV9BUFBFTkRFRF9EVEI9eQo+ICBDT05G SUdfS0VYRUM9eQo+ICBDT05GSUdfQ1BVX0ZSRVE9eQo+IC1DT05GSUdfQ1BVX0ZSRVFfU1RBVF9E RVRBSUxTPXkKPiArQ09ORklHX0NQVV9GUkVRX1NUQVQ9eQo+ICBDT05GSUdfQ1BVX0ZSRVFfR09W X1BPV0VSU0FWRT15Cj4gIENPTkZJR19DUFVfRlJFUV9HT1ZfVVNFUlNQQUNFPXkKPiAgQ09ORklH X0NQVV9GUkVRX0dPVl9PTkRFTUFORD15Cj4gZGlmZiAtLWdpdCBhL2FyY2gvbWlwcy9jb25maWdz L2xlbW90ZTJmX2RlZmNvbmZpZyBiL2FyY2gvbWlwcy9jb25maWdzL2xlbW90ZTJmX2RlZmNvbmZp Zwo+IGluZGV4IDVkYTc2ZTBlMTIwZi4uYmVkNzQ1NTk2ZDg2IDEwMDY0NAo+IC0tLSBhL2FyY2gv bWlwcy9jb25maWdzL2xlbW90ZTJmX2RlZmNvbmZpZwo+ICsrKyBiL2FyY2gvbWlwcy9jb25maWdz L2xlbW90ZTJmX2RlZmNvbmZpZwo+IEBAIC00MCw3ICs0MCw2IEBAIENPTkZJR19QTV9TVERfUEFS VElUSU9OPSIvZGV2L2hkYTMiCj4gIENPTkZJR19DUFVfRlJFUT15Cj4gIENPTkZJR19DUFVfRlJF UV9ERUJVRz15Cj4gIENPTkZJR19DUFVfRlJFUV9TVEFUPW0KPiAtQ09ORklHX0NQVV9GUkVRX1NU QVRfREVUQUlMUz15Cj4gIENPTkZJR19DUFVfRlJFUV9ERUZBVUxUX0dPVl9PTkRFTUFORD15Cj4g IENPTkZJR19DUFVfRlJFUV9HT1ZfUE9XRVJTQVZFPW0KPiAgQ09ORklHX0NQVV9GUkVRX0dPVl9V U0VSU1BBQ0U9bQo+IGRpZmYgLS1naXQgYS9hcmNoL3Bvd2VycGMvY29uZmlncy9wcGM2eHhfZGVm Y29uZmlnIGIvYXJjaC9wb3dlcnBjL2NvbmZpZ3MvcHBjNnh4X2RlZmNvbmZpZwo+IGluZGV4IDNj ZTkxYTNkZjI3Zi4uMWQyZDY5ZGQ2NDA5IDEwMDY0NAo+IC0tLSBhL2FyY2gvcG93ZXJwYy9jb25m aWdzL3BwYzZ4eF9kZWZjb25maWcKPiArKysgYi9hcmNoL3Bvd2VycGMvY29uZmlncy9wcGM2eHhf ZGVmY29uZmlnCj4gQEAgLTYyLDcgKzYyLDYgQEAgQ09ORklHX01QQzg2MTBfSFBDRD15Cj4gIENP TkZJR19HRUZfU0JDNjEwPXkKPiAgQ09ORklHX0NQVV9GUkVRPXkKPiAgQ09ORklHX0NQVV9GUkVR X1NUQVQ9bQo+IC1DT05GSUdfQ1BVX0ZSRVFfU1RBVF9ERVRBSUxTPXkKPiAgQ09ORklHX0NQVV9G UkVRX0RFRkFVTFRfR09WX1VTRVJTUEFDRT15Cj4gIENPTkZJR19DUFVfRlJFUV9HT1ZfUEVSRk9S TUFOQ0U9eQo+ICBDT05GSUdfQ1BVX0ZSRVFfR09WX1BPV0VSU0FWRT1tCj4gZGlmZiAtLWdpdCBh L2FyY2gvc2gvY29uZmlncy9zaDc3ODVsY3JfMzJiaXRfZGVmY29uZmlnIGIvYXJjaC9zaC9jb25m aWdzL3NoNzc4NWxjcl8zMmJpdF9kZWZjb25maWcKPiBpbmRleCA5YmRjZjcyZWMwNmEuLjJmY2U1 NGQ5YzM4OCAxMDA2NDQKPiAtLS0gYS9hcmNoL3NoL2NvbmZpZ3Mvc2g3Nzg1bGNyXzMyYml0X2Rl ZmNvbmZpZwo+ICsrKyBiL2FyY2gvc2gvY29uZmlncy9zaDc3ODVsY3JfMzJiaXRfZGVmY29uZmln Cj4gQEAgLTI1LDcgKzI1LDcgQEAgQ09ORklHX1NIX1NINzc4NUxDUj15Cj4gIENPTkZJR19OT19I Wj15Cj4gIENPTkZJR19ISUdIX1JFU19USU1FUlM9eQo+ICBDT05GSUdfQ1BVX0ZSRVE9eQo+IC1D T05GSUdfQ1BVX0ZSRVFfU1RBVF9ERVRBSUxTPXkKPiArQ09ORklHX0NQVV9GUkVRX1NUQVQ9eQo+ ICBDT05GSUdfQ1BVX0ZSRVFfREVGQVVMVF9HT1ZfT05ERU1BTkQ9eQo+ICBDT05GSUdfU0hfQ1BV X0ZSRVE9eQo+ICBDT05GSUdfSEVBUlRCRUFUPXkKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9jcHVm cmVxL0tjb25maWcgYi9kcml2ZXJzL2NwdWZyZXEvS2NvbmZpZwo+IGluZGV4IGQ4YjE2NGE3YzRl NS4uMTVhZGVmNDczZDQyIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvY3B1ZnJlcS9LY29uZmlnCj4g KysrIGIvZHJpdmVycy9jcHVmcmVxL0tjb25maWcKPiBAQCAtMzcsMTQgKzM3LDYgQEAgY29uZmln IENQVV9GUkVRX1NUQVQKPiAgCj4gIAkgIElmIGluIGRvdWJ0LCBzYXkgTi4KPiAgCj4gLWNvbmZp ZyBDUFVfRlJFUV9TVEFUX0RFVEFJTFMKPiAtCWJvb2wgIkNQVSBmcmVxdWVuY3kgdHJhbnNpdGlv biBzdGF0aXN0aWNzIGRldGFpbHMiCj4gLQlkZXBlbmRzIG9uIENQVV9GUkVRX1NUQVQKPiAtCWhl bHAKPiAtCSAgU2hvdyBkZXRhaWxlZCBDUFUgZnJlcXVlbmN5IHRyYW5zaXRpb24gdGFibGUgaW4g c3lzZnMuCj4gLQo+IC0JICBJZiBpbiBkb3VidCwgc2F5IE4uCj4gLQo+ICBjaG9pY2UKPiAgCXBy b21wdCAiRGVmYXVsdCBDUFVGcmVxIGdvdmVybm9yIgo+ICAJZGVmYXVsdCBDUFVfRlJFUV9ERUZB VUxUX0dPVl9VU0VSU1BBQ0UgaWYgQVJNX1NBMTEwMF9DUFVGUkVRIHx8IEFSTV9TQTExMTBfQ1BV RlJFUQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2NwdWZyZXEvY3B1ZnJlcV9zdGF0cy5jIGIvZHJp dmVycy9jcHVmcmVxL2NwdWZyZXFfc3RhdHMuYwo+IGluZGV4IGFjMjg0ZTY2ODM5Yy4uMThhYmQ0 NTRkYTQzIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvY3B1ZnJlcS9jcHVmcmVxX3N0YXRzLmMKPiAr KysgYi9kcml2ZXJzL2NwdWZyZXEvY3B1ZnJlcV9zdGF0cy5jCj4gQEAgLTI1LDkgKzI1LDcgQEAg c3RydWN0IGNwdWZyZXFfc3RhdHMgewo+ICAJdW5zaWduZWQgaW50IGxhc3RfaW5kZXg7Cj4gIAl1 NjQgKnRpbWVfaW5fc3RhdGU7Cj4gIAl1bnNpZ25lZCBpbnQgKmZyZXFfdGFibGU7Cj4gLSNpZmRl ZiBDT05GSUdfQ1BVX0ZSRVFfU1RBVF9ERVRBSUxTCj4gIAl1bnNpZ25lZCBpbnQgKnRyYW5zX3Rh YmxlOwo+IC0jZW5kaWYKPiAgfTsKPiAgCj4gIHN0YXRpYyBpbnQgY3B1ZnJlcV9zdGF0c191cGRh dGUoc3RydWN0IGNwdWZyZXFfc3RhdHMgKnN0YXRzKQo+IEBAIC00Niw5ICs0NCw3IEBAIHN0YXRp YyB2b2lkIGNwdWZyZXFfc3RhdHNfY2xlYXJfdGFibGUoc3RydWN0IGNwdWZyZXFfc3RhdHMgKnN0 YXRzKQo+ICAJdW5zaWduZWQgaW50IGNvdW50ID0gc3RhdHMtPm1heF9zdGF0ZTsKPiAgCj4gIAlt ZW1zZXQoc3RhdHMtPnRpbWVfaW5fc3RhdGUsIDAsIGNvdW50ICogc2l6ZW9mKHU2NCkpOwo+IC0j aWZkZWYgQ09ORklHX0NQVV9GUkVRX1NUQVRfREVUQUlMUwo+ICAJbWVtc2V0KHN0YXRzLT50cmFu c190YWJsZSwgMCwgY291bnQgKiBjb3VudCAqIHNpemVvZihpbnQpKTsKPiAtI2VuZGlmCj4gIAlz dGF0cy0+bGFzdF90aW1lID0gZ2V0X2ppZmZpZXNfNjQoKTsKPiAgCXN0YXRzLT50b3RhbF90cmFu cyA9IDA7Cj4gIH0KPiBAQCAtODQsNyArODAsNiBAQCBzdGF0aWMgc3NpemVfdCBzdG9yZV9yZXNl dChzdHJ1Y3QgY3B1ZnJlcV9wb2xpY3kgKnBvbGljeSwgY29uc3QgY2hhciAqYnVmLAo+ICAJcmV0 dXJuIGNvdW50Owo+ICB9Cj4gIAo+IC0jaWZkZWYgQ09ORklHX0NQVV9GUkVRX1NUQVRfREVUQUlM Uwo+ICBzdGF0aWMgc3NpemVfdCBzaG93X3RyYW5zX3RhYmxlKHN0cnVjdCBjcHVmcmVxX3BvbGlj eSAqcG9saWN5LCBjaGFyICpidWYpCj4gIHsKPiAgCXN0cnVjdCBjcHVmcmVxX3N0YXRzICpzdGF0 cyA9IHBvbGljeS0+c3RhdHM7Cj4gQEAgLTEyOSw3ICsxMjQsNiBAQCBzdGF0aWMgc3NpemVfdCBz aG93X3RyYW5zX3RhYmxlKHN0cnVjdCBjcHVmcmVxX3BvbGljeSAqcG9saWN5LCBjaGFyICpidWYp Cj4gIAlyZXR1cm4gbGVuOwo+ICB9Cj4gIGNwdWZyZXFfZnJlcV9hdHRyX3JvKHRyYW5zX3RhYmxl KTsKPiAtI2VuZGlmCj4gIAo+ICBjcHVmcmVxX2ZyZXFfYXR0cl9ybyh0b3RhbF90cmFucyk7Cj4g IGNwdWZyZXFfZnJlcV9hdHRyX3JvKHRpbWVfaW5fc3RhdGUpOwo+IEBAIC0xMzksOSArMTMzLDcg QEAgc3RhdGljIHN0cnVjdCBhdHRyaWJ1dGUgKmRlZmF1bHRfYXR0cnNbXSA9IHsKPiAgCSZ0b3Rh bF90cmFucy5hdHRyLAo+ICAJJnRpbWVfaW5fc3RhdGUuYXR0ciwKPiAgCSZyZXNldC5hdHRyLAo+ IC0jaWZkZWYgQ09ORklHX0NQVV9GUkVRX1NUQVRfREVUQUlMUwo+ICAJJnRyYW5zX3RhYmxlLmF0 dHIsCj4gLSNlbmRpZgo+ICAJTlVMTAo+ICB9Owo+ICBzdGF0aWMgc3RydWN0IGF0dHJpYnV0ZV9n cm91cCBzdGF0c19hdHRyX2dyb3VwID0gewo+IEBAIC0yMDAsOSArMTkyLDcgQEAgdm9pZCBjcHVm cmVxX3N0YXRzX2NyZWF0ZV90YWJsZShzdHJ1Y3QgY3B1ZnJlcV9wb2xpY3kgKnBvbGljeSkKPiAg Cj4gIAlhbGxvY19zaXplID0gY291bnQgKiBzaXplb2YoaW50KSArIGNvdW50ICogc2l6ZW9mKHU2 NCk7Cj4gIAo+IC0jaWZkZWYgQ09ORklHX0NQVV9GUkVRX1NUQVRfREVUQUlMUwo+ICAJYWxsb2Nf c2l6ZSArPSBjb3VudCAqIGNvdW50ICogc2l6ZW9mKGludCk7Cj4gLSNlbmRpZgo+ICAKPiAgCS8q IEFsbG9jYXRlIG1lbW9yeSBmb3IgdGltZV9pbl9zdGF0ZS9mcmVxX3RhYmxlL3RyYW5zX3RhYmxl IGluIG9uZSBnbyAqLwo+ICAJc3RhdHMtPnRpbWVfaW5fc3RhdGUgPSBremFsbG9jKGFsbG9jX3Np emUsIEdGUF9LRVJORUwpOwo+IEBAIC0yMTEsOSArMjAxLDcgQEAgdm9pZCBjcHVmcmVxX3N0YXRz X2NyZWF0ZV90YWJsZShzdHJ1Y3QgY3B1ZnJlcV9wb2xpY3kgKnBvbGljeSkKPiAgCj4gIAlzdGF0 cy0+ZnJlcV90YWJsZSA9ICh1bnNpZ25lZCBpbnQgKikoc3RhdHMtPnRpbWVfaW5fc3RhdGUgKyBj b3VudCk7Cj4gIAo+IC0jaWZkZWYgQ09ORklHX0NQVV9GUkVRX1NUQVRfREVUQUlMUwo+ICAJc3Rh dHMtPnRyYW5zX3RhYmxlID0gc3RhdHMtPmZyZXFfdGFibGUgKyBjb3VudDsKPiAtI2VuZGlmCj4g IAo+ICAJc3RhdHMtPm1heF9zdGF0ZSA9IGNvdW50Owo+ICAKPiBAQCAtMjU5LDggKzI0Nyw2IEBA IHZvaWQgY3B1ZnJlcV9zdGF0c19yZWNvcmRfdHJhbnNpdGlvbihzdHJ1Y3QgY3B1ZnJlcV9wb2xp Y3kgKnBvbGljeSwKPiAgCWNwdWZyZXFfc3RhdHNfdXBkYXRlKHN0YXRzKTsKPiAgCj4gIAlzdGF0 cy0+bGFzdF9pbmRleCA9IG5ld19pbmRleDsKPiAtI2lmZGVmIENPTkZJR19DUFVfRlJFUV9TVEFU X0RFVEFJTFMKPiAgCXN0YXRzLT50cmFuc190YWJsZVtvbGRfaW5kZXggKiBzdGF0cy0+bWF4X3N0 YXRlICsgbmV3X2luZGV4XSsrOwo+IC0jZW5kaWYKPiAgCXN0YXRzLT50b3RhbF90cmFucysrOwo+ ICB9Cj4gLS0gCj4gMi43LjEuNDEwLmc2ZmFmMjdiCj4KCi0tIApHcmVnb3J5IENsZW1lbnQsIEZy ZWUgRWxlY3Ryb25zCktlcm5lbCwgZHJpdmVycywgcmVhbC10aW1lIGFuZCBlbWJlZGRlZCBMaW51 eApkZXZlbG9wbWVudCwgY29uc3VsdGluZywgdHJhaW5pbmcgYW5kIHN1cHBvcnQuCmh0dHA6Ly9m cmVlLWVsZWN0cm9ucy5jb20KLS0KVG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlzIGxpc3Q6IHNlbmQg dGhlIGxpbmUgInVuc3Vic2NyaWJlIGxpbnV4LXNoIiBpbgp0aGUgYm9keSBvZiBhIG1lc3NhZ2Ug dG8gbWFqb3Jkb21vQHZnZXIua2VybmVsLm9yZwpNb3JlIG1ham9yZG9tbyBpbmZvIGF0ICBodHRw Oi8vdmdlci5rZXJuZWwub3JnL21ham9yZG9tby1pbmZvLmh0bWw= From mboxrd@z Thu Jan 1 00:00:00 1970 From: gregory.clement@free-electrons.com (Gregory CLEMENT) Date: Thu, 05 Jan 2017 10:50:25 +0100 Subject: [PATCH] cpufreq: Remove CONFIG_CPU_FREQ_STAT_DETAILS config option In-Reply-To: (Viresh Kumar's message of "Thu, 5 Jan 2017 13:57:41 +0530") References: Message-ID: <877f69esym.fsf@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Viresh, On jeu., janv. 05 2017, Viresh Kumar wrote: > This doesn't have any benefit apart from saving a small amount of memory > when it is disabled. The ifdef hackery in the code makes it dirty > unnecessarily. > > Clean it up by removing the Kconfig option completely. Few defconfigs > are also updated and CONFIG_CPU_FREQ_STAT_DETAILS is replaced with > CONFIG_CPU_FREQ_STAT now in them, as users wanted stats to be enabled. > > Signed-off-by: Viresh Kumar > --- > arch/arm/configs/exynos_defconfig | 2 +- > arch/arm/configs/multi_v5_defconfig | 2 +- > arch/arm/configs/multi_v7_defconfig | 2 +- > arch/arm/configs/mvebu_v5_defconfig | 2 +- For this file: Acked-by: Gregory CLEMENT Gregory > arch/arm/configs/pxa_defconfig | 2 +- > arch/arm/configs/shmobile_defconfig | 2 +- > arch/mips/configs/lemote2f_defconfig | 1 - > arch/powerpc/configs/ppc6xx_defconfig | 1 - > arch/sh/configs/sh7785lcr_32bit_defconfig | 2 +- > drivers/cpufreq/Kconfig | 8 -------- > drivers/cpufreq/cpufreq_stats.c | 14 -------------- > 11 files changed, 7 insertions(+), 31 deletions(-) > > diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig > index 79c415c33f69..809f0bf3042a 100644 > --- a/arch/arm/configs/exynos_defconfig > +++ b/arch/arm/configs/exynos_defconfig > @@ -24,7 +24,7 @@ CONFIG_ARM_APPENDED_DTB=y > CONFIG_ARM_ATAG_DTB_COMPAT=y > CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M" > CONFIG_CPU_FREQ=y > -CONFIG_CPU_FREQ_STAT_DETAILS=y > +CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=m > CONFIG_CPU_FREQ_GOV_USERSPACE=m > diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig > index 361686a362f1..69a4bd13eea5 100644 > --- a/arch/arm/configs/multi_v5_defconfig > +++ b/arch/arm/configs/multi_v5_defconfig > @@ -58,7 +58,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 > CONFIG_ARM_APPENDED_DTB=y > CONFIG_ARM_ATAG_DTB_COMPAT=y > CONFIG_CPU_FREQ=y > -CONFIG_CPU_FREQ_STAT_DETAILS=y > +CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_CPU_IDLE=y > CONFIG_ARM_KIRKWOOD_CPUIDLE=y > diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig > index b01a43851294..2dcac90eba01 100644 > --- a/arch/arm/configs/multi_v7_defconfig > +++ b/arch/arm/configs/multi_v7_defconfig > @@ -132,7 +132,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y > CONFIG_KEXEC=y > CONFIG_EFI=y > CONFIG_CPU_FREQ=y > -CONFIG_CPU_FREQ_STAT_DETAILS=y > +CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=m > CONFIG_CPU_FREQ_GOV_USERSPACE=m > diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig > index f7f6039419aa..4b598da0d086 100644 > --- a/arch/arm/configs/mvebu_v5_defconfig > +++ b/arch/arm/configs/mvebu_v5_defconfig > @@ -44,7 +44,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 > CONFIG_ARM_APPENDED_DTB=y > CONFIG_ARM_ATAG_DTB_COMPAT=y > CONFIG_CPU_FREQ=y > -CONFIG_CPU_FREQ_STAT_DETAILS=y > +CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_CPU_IDLE=y > CONFIG_ARM_KIRKWOOD_CPUIDLE=y > diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig > index e4314b1227a3..271dc7e78e43 100644 > --- a/arch/arm/configs/pxa_defconfig > +++ b/arch/arm/configs/pxa_defconfig > @@ -97,7 +97,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 > CONFIG_CMDLINE="root=/dev/ram0 ro" > CONFIG_KEXEC=y > CONFIG_CPU_FREQ=y > -CONFIG_CPU_FREQ_STAT_DETAILS=y > +CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=m > CONFIG_CPU_FREQ_GOV_USERSPACE=m > diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig > index 1b0f8ae36fb3..adeaecd831a4 100644 > --- a/arch/arm/configs/shmobile_defconfig > +++ b/arch/arm/configs/shmobile_defconfig > @@ -38,7 +38,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 > CONFIG_ARM_APPENDED_DTB=y > CONFIG_KEXEC=y > CONFIG_CPU_FREQ=y > -CONFIG_CPU_FREQ_STAT_DETAILS=y > +CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=y > CONFIG_CPU_FREQ_GOV_USERSPACE=y > CONFIG_CPU_FREQ_GOV_ONDEMAND=y > diff --git a/arch/mips/configs/lemote2f_defconfig b/arch/mips/configs/lemote2f_defconfig > index 5da76e0e120f..bed745596d86 100644 > --- a/arch/mips/configs/lemote2f_defconfig > +++ b/arch/mips/configs/lemote2f_defconfig > @@ -40,7 +40,6 @@ CONFIG_PM_STD_PARTITION="/dev/hda3" > CONFIG_CPU_FREQ=y > CONFIG_CPU_FREQ_DEBUG=y > CONFIG_CPU_FREQ_STAT=m > -CONFIG_CPU_FREQ_STAT_DETAILS=y > CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=m > CONFIG_CPU_FREQ_GOV_USERSPACE=m > diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig > index 3ce91a3df27f..1d2d69dd6409 100644 > --- a/arch/powerpc/configs/ppc6xx_defconfig > +++ b/arch/powerpc/configs/ppc6xx_defconfig > @@ -62,7 +62,6 @@ CONFIG_MPC8610_HPCD=y > CONFIG_GEF_SBC610=y > CONFIG_CPU_FREQ=y > CONFIG_CPU_FREQ_STAT=m > -CONFIG_CPU_FREQ_STAT_DETAILS=y > CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y > CONFIG_CPU_FREQ_GOV_PERFORMANCE=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=m > diff --git a/arch/sh/configs/sh7785lcr_32bit_defconfig b/arch/sh/configs/sh7785lcr_32bit_defconfig > index 9bdcf72ec06a..2fce54d9c388 100644 > --- a/arch/sh/configs/sh7785lcr_32bit_defconfig > +++ b/arch/sh/configs/sh7785lcr_32bit_defconfig > @@ -25,7 +25,7 @@ CONFIG_SH_SH7785LCR=y > CONFIG_NO_HZ=y > CONFIG_HIGH_RES_TIMERS=y > CONFIG_CPU_FREQ=y > -CONFIG_CPU_FREQ_STAT_DETAILS=y > +CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_SH_CPU_FREQ=y > CONFIG_HEARTBEAT=y > diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig > index d8b164a7c4e5..15adef473d42 100644 > --- a/drivers/cpufreq/Kconfig > +++ b/drivers/cpufreq/Kconfig > @@ -37,14 +37,6 @@ config CPU_FREQ_STAT > > If in doubt, say N. > > -config CPU_FREQ_STAT_DETAILS > - bool "CPU frequency transition statistics details" > - depends on CPU_FREQ_STAT > - help > - Show detailed CPU frequency transition table in sysfs. > - > - If in doubt, say N. > - > choice > prompt "Default CPUFreq governor" > default CPU_FREQ_DEFAULT_GOV_USERSPACE if ARM_SA1100_CPUFREQ || ARM_SA1110_CPUFREQ > diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c > index ac284e66839c..18abd454da43 100644 > --- a/drivers/cpufreq/cpufreq_stats.c > +++ b/drivers/cpufreq/cpufreq_stats.c > @@ -25,9 +25,7 @@ struct cpufreq_stats { > unsigned int last_index; > u64 *time_in_state; > unsigned int *freq_table; > -#ifdef CONFIG_CPU_FREQ_STAT_DETAILS > unsigned int *trans_table; > -#endif > }; > > static int cpufreq_stats_update(struct cpufreq_stats *stats) > @@ -46,9 +44,7 @@ static void cpufreq_stats_clear_table(struct cpufreq_stats *stats) > unsigned int count = stats->max_state; > > memset(stats->time_in_state, 0, count * sizeof(u64)); > -#ifdef CONFIG_CPU_FREQ_STAT_DETAILS > memset(stats->trans_table, 0, count * count * sizeof(int)); > -#endif > stats->last_time = get_jiffies_64(); > stats->total_trans = 0; > } > @@ -84,7 +80,6 @@ static ssize_t store_reset(struct cpufreq_policy *policy, const char *buf, > return count; > } > > -#ifdef CONFIG_CPU_FREQ_STAT_DETAILS > static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf) > { > struct cpufreq_stats *stats = policy->stats; > @@ -129,7 +124,6 @@ static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf) > return len; > } > cpufreq_freq_attr_ro(trans_table); > -#endif > > cpufreq_freq_attr_ro(total_trans); > cpufreq_freq_attr_ro(time_in_state); > @@ -139,9 +133,7 @@ static struct attribute *default_attrs[] = { > &total_trans.attr, > &time_in_state.attr, > &reset.attr, > -#ifdef CONFIG_CPU_FREQ_STAT_DETAILS > &trans_table.attr, > -#endif > NULL > }; > static struct attribute_group stats_attr_group = { > @@ -200,9 +192,7 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy) > > alloc_size = count * sizeof(int) + count * sizeof(u64); > > -#ifdef CONFIG_CPU_FREQ_STAT_DETAILS > alloc_size += count * count * sizeof(int); > -#endif > > /* Allocate memory for time_in_state/freq_table/trans_table in one go */ > stats->time_in_state = kzalloc(alloc_size, GFP_KERNEL); > @@ -211,9 +201,7 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy) > > stats->freq_table = (unsigned int *)(stats->time_in_state + count); > > -#ifdef CONFIG_CPU_FREQ_STAT_DETAILS > stats->trans_table = stats->freq_table + count; > -#endif > > stats->max_state = count; > > @@ -259,8 +247,6 @@ void cpufreq_stats_record_transition(struct cpufreq_policy *policy, > cpufreq_stats_update(stats); > > stats->last_index = new_index; > -#ifdef CONFIG_CPU_FREQ_STAT_DETAILS > stats->trans_table[old_index * stats->max_state + new_index]++; > -#endif > stats->total_trans++; > } > -- > 2.7.1.410.g6faf27b > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com