Commit c2ee31fb authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jia, Yingbao
Browse files

cpufreq: intel_pstate: hide unused intel_pstate_cpu_oob_ids[] 

mainline inclusion
from mainline-v6.10
commit 8c556541a53848d6611ff8b5f9bf52e96c56f48e
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/IB6QC4
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8c556541a53848d6611ff8b5f9bf52e96c56f48e



-------------------------------------------------

Intel-SIG: commit 8c556541a538 cpufreq: intel_pstate: hide unused intel_pstate_cpu_oob_ids[].
Backport intel_pstate driver update for 6.6 from 6.11

The reference to this variable is hidden in an #ifdef:

drivers/cpufreq/intel_pstate.c:2440:32: error: 'intel_pstate_cpu_oob_ids' defined but not used [-Werror=unused-const-variable=]

Use the same check around the definition.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent c1f9e33a

drivers/cpufreq/intel_pstate.c

+2 −0
Original line number Diff line number Diff line
@@ -2396,6 +2396,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = { 
};

MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);



#ifdef CONFIG_ACPI

static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = {

	X86_MATCH(BROADWELL_D,		core_funcs),

	X86_MATCH(BROADWELL_X,		core_funcs),
@@ -2404,6 +2405,7 @@ static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = { 
	X86_MATCH(SAPPHIRERAPIDS_X,	core_funcs),

	{}

};

#endif



static const struct x86_cpu_id intel_pstate_cpu_ee_disable_ids[] = {

	X86_MATCH(KABYLAKE,		core_funcs),