cpufreq: intel_pstate: remove incorrect __initconst annotation

Message ID 20180608151411.3892739-1-arnd@arndb.de
State New
Headers show
Series
  • cpufreq: intel_pstate: remove incorrect __initconst annotation
Related show

Commit Message

Arnd Bergmann June 8, 2018, 3:14 p.m.
We get a build warning about the newly introduced code in
intel_pstate_init_cpu() that references an __initconst variable after
it has been freed:

WARNING: vmlinux.o(.text+0xf9eca2): Section mismatch in reference from the function intel_pstate_init_cpu() to the variable .init.rodata:intel_pstate_hwp_boost_ids
The function intel_pstate_init_cpu() references
the variable __initconst intel_pstate_hwp_boost_ids.
This is often because intel_pstate_init_cpu lacks a __initconst
annotation or the annotation of intel_pstate_hwp_boost_ids is wrong.

This removes the annotation to keep the variable around at
runtime.

Fixes: f50f70793d78 ("cpufreq: intel_pstate: enable boost for Skylake Xeon")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/cpufreq/intel_pstate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.9.0

Comments

Srinivas Pandruvada June 8, 2018, 3:21 p.m. | #1
On Fri, 2018-06-08 at 17:14 +0200, Arnd Bergmann wrote:
> We get a build warning about the newly introduced code in

> intel_pstate_init_cpu() that references an __initconst variable after

> it has been freed:

> 

I see Rafael already addressed this.
https://kernel.googlesource.com/pub/scm/linux/kernel/git/rafael/linux-p
m/+/41ab43c9c89e06ff08a4750d1b09e227ea97894f%5E%21/#F0

Thanks,
Srinivas

> WARNING: vmlinux.o(.text+0xf9eca2): Section mismatch in reference

> from the function intel_pstate_init_cpu() to the variable

> .init.rodata:intel_pstate_hwp_boost_ids

> The function intel_pstate_init_cpu() references

> the variable __initconst intel_pstate_hwp_boost_ids.

> This is often because intel_pstate_init_cpu lacks a __initconst

> annotation or the annotation of intel_pstate_hwp_boost_ids is wrong.

> 

> This removes the annotation to keep the variable around at

> runtime.

> 

> Fixes: f50f70793d78 ("cpufreq: intel_pstate: enable boost for Skylake

> Xeon")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/cpufreq/intel_pstate.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/drivers/cpufreq/intel_pstate.c

> b/drivers/cpufreq/intel_pstate.c

> index 2065724dbffc..380936700165 100644

> --- a/drivers/cpufreq/intel_pstate.c

> +++ b/drivers/cpufreq/intel_pstate.c

> @@ -1794,7 +1794,7 @@ static const struct x86_cpu_id

> intel_pstate_cpu_ee_disable_ids[] = {

>  	{}

>  };

>  

> -static const struct x86_cpu_id intel_pstate_hwp_boost_ids[]

> __initconst = {

> +static const struct x86_cpu_id intel_pstate_hwp_boost_ids[] = {

>  	ICPU(INTEL_FAM6_SKYLAKE_X, core_funcs),

>  	ICPU(INTEL_FAM6_SKYLAKE_DESKTOP, core_funcs),

>  	{}

Patch

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 2065724dbffc..380936700165 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1794,7 +1794,7 @@  static const struct x86_cpu_id intel_pstate_cpu_ee_disable_ids[] = {
 	{}
 };
 
-static const struct x86_cpu_id intel_pstate_hwp_boost_ids[] __initconst = {
+static const struct x86_cpu_id intel_pstate_hwp_boost_ids[] = {
 	ICPU(INTEL_FAM6_SKYLAKE_X, core_funcs),
 	ICPU(INTEL_FAM6_SKYLAKE_DESKTOP, core_funcs),
 	{}