On Thu, Oct 13, 2016 at 05:30:55PM +0200, Piotr Luc wrote: > Use macros of Intel processor families instead of raw numbers. > > Signed-off-by: Piotr Luc <[email protected]> > Reviewed-by: Dave Hansen <[email protected]> > Cc: Mauro Carvalho Chehab <[email protected]> > Cc: Doug Thompson <[email protected]> > Cc: Borislav Petkov <[email protected]> > Cc: [email protected] > Cc: [email protected] > Cc: "Luck, Tony" <[email protected]> > Cc: "Shevchenko, Andriy" <[email protected]> > --- > drivers/edac/sb_edac.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c > index ce0067b..90564bc 100644 > --- a/drivers/edac/sb_edac.c > +++ b/drivers/edac/sb_edac.c > @@ -23,6 +23,7 @@ > #include <linux/math64.h> > #include <linux/mod_devicetable.h> > #include <asm/cpu_device_id.h> > +#include <asm/intel-family.h> > #include <asm/processor.h> > #include <asm/mce.h> > > @@ -3366,12 +3367,12 @@ fail0: > { X86_VENDOR_INTEL, 6, model, 0, (unsigned long)&table } > > static const struct x86_cpu_id sbridge_cpuids[] = { > - ICPU(0x2d, pci_dev_descr_sbridge_table), /* SANDY_BRIDGE */ > - ICPU(0x3e, pci_dev_descr_ibridge_table), /* IVY_BRIDGE */ > - ICPU(0x3f, pci_dev_descr_haswell_table), /* HASWELL */ > - ICPU(0x4f, pci_dev_descr_broadwell_table), /* BROADWELL */ > - ICPU(0x56, pci_dev_descr_broadwell_table), /* BROADWELL-DE */ > - ICPU(0x57, pci_dev_descr_knl_table), /* KNIGHTS_LANDING */ > + ICPU(INTEL_FAM6_SANDYBRIDGE_X, pci_dev_descr_sbridge_table), > + ICPU(INTEL_FAM6_IVYBRIDGE_X, pci_dev_descr_ibridge_table), > + ICPU(INTEL_FAM6_HASWELL_X, pci_dev_descr_haswell_table), > + ICPU(INTEL_FAM6_BROADWELL_X, pci_dev_descr_broadwell_table), > + ICPU(INTEL_FAM6_BROADWELL_XEON_D, pci_dev_descr_broadwell_table), > + ICPU(INTEL_FAM6_XEON_PHI_KNL, pci_dev_descr_knl_table), > { } > }; > MODULE_DEVICE_TABLE(x86cpu, sbridge_cpuids); > --
I took Dave's patch here, instead: https://lkml.kernel.org/r/[email protected] -- Regards/Gruss, Boris. ECO tip #101: Trim your mails when you reply.
