<asm/cpu_device_id.h> now has a generic version, so the #ifdef CONFIG_X86 around the include is no longer needed.
od_should_io_be_busy() still needs CONFIG_X86 for boot_cpu_data. Signed-off-by: Pavel Popov <[email protected]> --- Depends on <asm-generic/cpu_device_id.h> from [1]; please apply after it is in mainline. [1] https://lore.kernel.org/r/[email protected] drivers/cpufreq/cpufreq_ondemand.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/cpufreq_ondemand.h b/drivers/cpufreq/cpufreq_ondemand.h index 2ca8f1aaf2e..0e33865f9d3 100644 --- a/drivers/cpufreq/cpufreq_ondemand.h +++ b/drivers/cpufreq/cpufreq_ondemand.h @@ -6,6 +6,8 @@ * Author: Rafael J. Wysocki <[email protected]> */ +#include <asm/cpu_device_id.h> + #include "cpufreq_governor.h" struct od_policy_dbs_info { @@ -26,8 +28,6 @@ struct od_dbs_tuners { }; #ifdef CONFIG_X86 -#include <asm/cpu_device_id.h> - /* * Not all CPUs want IO time to be accounted as busy; this depends on * how efficient idling at a higher frequency/voltage is. -- 2.54.0
