Re: [PATCH] cpufreq/intel_pstate: Fix an annoying !CONFIG_SMP warning

[Rafael J. Wysocki]

On Friday, April 03, 2015 03:19:53 PM Borislav Petkov wrote:
> From: Borislav Petkov <bp@xxxxxxx>
> 
> I keep seeing
> 
>   drivers/cpufreq/intel_pstate.c: In function âintel_pstate_initâ:
>   drivers/cpufreq/intel_pstate.c:1187:26: warning: initialization from incompatible pointer type
>     struct cpuinfo_x86 *c = &boot_cpu_data;
> 
> when doing randconfig builds.
> 
> This is caused by the fact that when !CONFIG_SMP, asm/processor.h
> defines cpu_info to boot_cpu_data and the local variable
> 
>   struct cpu_defaults *cpu_info
> 
> overshadows it leading to this unfortunate assignment in the
> preprocessed source:
> 
>  struct cpu_defaults *boot_cpu_data;
>  struct cpuinfo_x86 *c = &boot_cpu_data;
> 
> Rename the local variable and use static_cpu_has_safe() which alleviates
> the need for defining a local cpuinfo_x86 pointer.

Kristen, any comments here?

> Signed-off-by: Borislav Petkov <bp@xxxxxxx>
> Cc: Kristen Carlson Accardi <kristen@xxxxxxxxxxxxxxx>
> Cc: "Rafael J. Wysocki" <rjw@xxxxxxxxxxxxx>
> Cc: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
> Cc: linux-pm@xxxxxxxxxxxxxxx
> ---
>  drivers/cpufreq/intel_pstate.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
> index 872c5772c5d3..0b883f131a73 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -31,6 +31,7 @@
>  #include <asm/div64.h>
>  #include <asm/msr.h>
>  #include <asm/cpu_device_id.h>
> +#include <asm/cpufeature.h>
>  
>  #define BYT_RATIOS		0x66a
>  #define BYT_VIDS		0x66b
> @@ -1183,8 +1184,7 @@ static int __init intel_pstate_init(void)
>  {
>  	int cpu, rc = 0;
>  	const struct x86_cpu_id *id;
> -	struct cpu_defaults *cpu_info;
> -	struct cpuinfo_x86 *c = &boot_cpu_data;
> +	struct cpu_defaults *cpu_def;
>  
>  	if (no_load)
>  		return -ENODEV;
> @@ -1200,10 +1200,10 @@ static int __init intel_pstate_init(void)
>  	if (intel_pstate_platform_pwr_mgmt_exists())
>  		return -ENODEV;
>  
> -	cpu_info = (struct cpu_defaults *)id->driver_data;
> +	cpu_def = (struct cpu_defaults *)id->driver_data;
>  
> -	copy_pid_params(&cpu_info->pid_policy);
> -	copy_cpu_funcs(&cpu_info->funcs);
> +	copy_pid_params(&cpu_def->pid_policy);
> +	copy_cpu_funcs(&cpu_def->funcs);
>  
>  	if (intel_pstate_msrs_not_valid())
>  		return -ENODEV;
> @@ -1214,7 +1214,7 @@ static int __init intel_pstate_init(void)
>  	if (!all_cpu_data)
>  		return -ENOMEM;
>  
> -	if (cpu_has(c,X86_FEATURE_HWP) && !no_hwp)
> +	if (static_cpu_has_safe(X86_FEATURE_HWP) && !no_hwp)
>  		intel_pstate_hwp_enable();
>  
>  	if (!hwp_active && hwp_only)
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/