<asm/cpu_device_id.h> now has a generic version, so the #ifdef CONFIG_X86 around the include is no longer needed. The include of <linux/device-id/x86_cpu.h>, which is generic, moves out of the #ifdef as well.
The soc_intel_is_*() helpers still need CONFIG_X86 for the INTEL_* model defines. 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] include/linux/platform_data/x86/soc.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/linux/platform_data/x86/soc.h b/include/linux/platform_data/x86/soc.h index a6a6b313dfa..ee696e576a0 100644 --- a/include/linux/platform_data/x86/soc.h +++ b/include/linux/platform_data/x86/soc.h @@ -9,13 +9,12 @@ #define __PLATFORM_DATA_X86_SOC_H #include <linux/types.h> - -#if IS_ENABLED(CONFIG_X86) - #include <linux/device-id/x86_cpu.h> #include <asm/cpu_device_id.h> +#if IS_ENABLED(CONFIG_X86) + #define SOC_INTEL_IS_CPU(soc, type) \ static inline bool soc_intel_is_##soc(void) \ { \ -- 2.54.0
