Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64df1fdf authored by Borislav Petkov's avatar Borislav Petkov Committed by Rafael J. Wysocki
Browse files

cpufreq: intel_pstate: Fix an annoying !CONFIG_SMP warning 



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.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarKristen Carlson Accardi <kristen@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 6a82ba6d

drivers/cpufreq/intel_pstate.c

+6 −6
Original line number Diff line number Diff line
@@ -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
@@ -1200,8 +1201,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;
@@ -1217,10 +1217,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;
@@ -1231,7 +1231,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)