From mboxrd@z Thu Jan 1 00:00:00 1970 From: Larry Finger Subject: [PATCH V2] Fix problem with cpufreq_ondemand or cpufreq_conservative Date: Fri, 28 Dec 2012 18:21:33 -0600 Message-ID: <50DE378D.4090008@lwfinger.net> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:message-id:date:from:user-agent:mime-version:to :cc:subject:content-type:content-transfer-encoding; bh=67Vvd0vMEDdCrmDTWZpir/ucOsZqSpv+0bKDYc0f8Zg=; b=uZ/QV9/TSRzHDDReK9mq2DX0DhsUzIfhgCCwyac1nzjQAFYk+C7hCeob00JzCyjAd2 f67QDeCcMtx0A58+wk60JWQ/ST/bAUkzf7b78fXhIkR/o0HvL8V9+ATEuz0OUZj4Vg16 qT8PX1/j602WKC70TKFGM2oAPV2lsHcZeOazPUqPgxrTPDea1w4lZuVMEXuPp+E9qHOp d87arSLRWbC5T471G3Se/T08FbfOh2koQviUf020rEvjUjhc4wKumXoLtR2qevbHAU7W /fcVOvcKbdEOEffyV/jib+RXn55YiwKLIe1InQAO1gPP6YCcmXImXq5mTR51blVpqzc6 xV5w== Sender: linux-kernel-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii"; format="flowed" To: viresh kumar , "Rafael J. Wysocki" Cc: cpufreq@vger.kernel.org, Linux PM list , LKML Since commit 2aacdff entitled "cpufreq: Move common part from governors to separate file", whenever the drivers that depend on this new file (cpufreq_ondemand or cpufreq_conservative) are built as modules, a new module named cpufreq_governor is created. It seems that kmake is smart enough to create a separate module whenever more than one module includes the same object file. As drivers/cpufreq/cpufreq_governor.c contains no MODULE directives, the resulting module has no license specified, which results in logging of a "module license 'unspecified' taints kernel". In addition, a number of globals are exported GPL only, and are therefore not available. Signed-off-by: Larry Finger --- V2 is the more complicated version that makes clear what is happening. Larry --- Kconfig | 5 +++++ Makefile | 5 +++-- cpufreq_governor.c | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) --- Index: wireless-testing-new/drivers/cpufreq/Makefile =================================================================== --- wireless-testing-new.orig/drivers/cpufreq/Makefile +++ wireless-testing-new/drivers/cpufreq/Makefile @@ -7,8 +7,9 @@ obj-$(CONFIG_CPU_FREQ_STAT) obj-$(CONFIG_CPU_FREQ_GOV_PERFORMANCE) += cpufreq_performance.o obj-$(CONFIG_CPU_FREQ_GOV_POWERSAVE) += cpufreq_powersave.o obj-$(CONFIG_CPU_FREQ_GOV_USERSPACE) += cpufreq_userspace.o -obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND) += cpufreq_ondemand.o cpufreq_governor.o -obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE) += cpufreq_conservative.o cpufreq_governor.o +obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND) += cpufreq_ondemand.o +obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE) += cpufreq_conservative.o +obj-$(CONFIG_CPU_FREQ_GOVERNOR) += cpufreq_governor.o # CPUfreq cross-arch helpers obj-$(CONFIG_CPU_FREQ_TABLE) += freq_table.o Index: wireless-testing-new/drivers/cpufreq/Kconfig =================================================================== --- wireless-testing-new.orig/drivers/cpufreq/Kconfig +++ wireless-testing-new/drivers/cpufreq/Kconfig @@ -20,6 +20,9 @@ if CPU_FREQ config CPU_FREQ_TABLE tristate +config CPU_FREQ_GOVERNOR + tristate + config CPU_FREQ_STAT tristate "CPU frequency translation statistics" select CPU_FREQ_TABLE @@ -141,6 +144,7 @@ config CPU_FREQ_GOV_USERSPACE config CPU_FREQ_GOV_ONDEMAND tristate "'ondemand' cpufreq policy governor" select CPU_FREQ_TABLE + select CPU_FREQ_GOVERNOR help 'ondemand' - This driver adds a dynamic cpufreq policy governor. The governor does a periodic polling and @@ -159,6 +163,7 @@ config CPU_FREQ_GOV_ONDEMAND config CPU_FREQ_GOV_CONSERVATIVE tristate "'conservative' cpufreq governor" depends on CPU_FREQ + select CPU_FREQ_GOVERNOR help 'conservative' - this driver is rather similar to the 'ondemand' governor both in its source code and its purpose, the difference is Index: wireless-testing-new/drivers/cpufreq/cpufreq_governor.c =================================================================== --- wireless-testing-new.orig/drivers/cpufreq/cpufreq_governor.c +++ wireless-testing-new/drivers/cpufreq/cpufreq_governor.c @@ -316,3 +316,8 @@ second_time: return 0; } EXPORT_SYMBOL_GPL(cpufreq_governor_dbs); + +MODULE_AUTHOR("Alexander Clouter "); +MODULE_DESCRIPTION("'cpufreq_governor' - A mini-module containing common code " + "for cpufreq_conservative and cpufreq_ondemand"); +MODULE_LICENSE("GPL");