x86/smpboot: Remove the last ICPU() macro (2fa9a3cf) · Commits · 戴 / test

Now all is using the shiny new macros. No code changed: # arch/x86/kernel/smpboot.o: text data bss dec hex filename 16432 2649 40 19121 4ab1 smpboot.o.before 16432 2649 40 19121 4ab1 smpboot.o.after md5: a58104003b72c1de533095bc5a4c30a9 smpboot.o.before.asm a58104003b72c1de533095bc5a4c30a9 smpboot.o.after.asm Signed-off-by:

Borislav Petkov <bp@suse.de> Cc: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/20200324185836.GI22931@zn.tnic

arch/x86/kernel/smpboot.c

+9 −8

Original line number	Diff line number	Diff line
		@@ -1849,24 +1849,25 @@ static bool slv_set_max_freq_ratio(u64 base_freq, u64 turbo_freq)
		#include <asm/cpu_device_id.h>
		#include <asm/intel-family.h>

		#define ICPU(model) \
		{X86_VENDOR_INTEL, 6, model, X86_FEATURE_APERFMPERF, 0}
		#define X86_MATCH(model) \
		X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, \
		INTEL_FAM6_##model, X86_FEATURE_APERFMPERF, NULL)

		static const struct x86_cpu_id has_knl_turbo_ratio_limits[] = {
		ICPU(INTEL_FAM6_XEON_PHI_KNL),
		ICPU(INTEL_FAM6_XEON_PHI_KNM),
		X86_MATCH(XEON_PHI_KNL),
		X86_MATCH(XEON_PHI_KNM),
		{}
		};

		static const struct x86_cpu_id has_skx_turbo_ratio_limits[] = {
		ICPU(INTEL_FAM6_SKYLAKE_X),
		X86_MATCH(SKYLAKE_X),
		{}
		};

		static const struct x86_cpu_id has_glm_turbo_ratio_limits[] = {
		ICPU(INTEL_FAM6_ATOM_GOLDMONT),
		ICPU(INTEL_FAM6_ATOM_GOLDMONT_D),
		ICPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS),
		X86_MATCH(ATOM_GOLDMONT),
		X86_MATCH(ATOM_GOLDMONT_D),
		X86_MATCH(ATOM_GOLDMONT_PLUS),
		{}
		};

Admin message