Driver data can be a plain integer and we have such users. For now they are implementing a custom macro to accept this.
Let's allow them to use generic one by moving address-of operation outside of the INTEL_CPU_FAM_ANY() macro. Signed-off-by: Andy Shevchenko <[email protected]> --- arch/x86/include/asm/intel-family.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index 698d53852919..4120dfcd8891 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@ -87,10 +87,10 @@ .family = _family, \ .model = _model, \ .feature = X86_FEATURE_ANY, \ - .driver_data = (kernel_ulong_t)&_driver_data \ + .driver_data = (kernel_ulong_t)_driver_data \ } #define INTEL_CPU_FAM6(_model, _driver_data) \ - INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data) + INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, &_driver_data) #endif /* _ASM_X86_INTEL_FAMILY_H */ -- 2.20.1
