From: Ingo Molnar Date: Mon, 24 Jun 2019 17:25:52 +0000 (+0200) Subject: Merge tag 'v5.2-rc6' into perf/core, to refresh branch X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b9271f0c65e12efd9b6319f57a378aac1be98b22;p=linux.git Merge tag 'v5.2-rc6' into perf/core, to refresh branch Signed-off-by: Ingo Molnar --- b9271f0c65e12efd9b6319f57a378aac1be98b22 diff --cc arch/x86/include/asm/intel-family.h index 087de5d3b93ae,310118805f576..f60ddd655c787 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@@ -52,8 -52,10 +52,11 @@@ #define INTEL_FAM6_CANNONLAKE_MOBILE 0x66 + #define INTEL_FAM6_ICELAKE_X 0x6A + #define INTEL_FAM6_ICELAKE_XEON_D 0x6C + #define INTEL_FAM6_ICELAKE_DESKTOP 0x7D #define INTEL_FAM6_ICELAKE_MOBILE 0x7E +#define INTEL_FAM6_ICELAKE_NNPI 0x9D /* "Small Core" Processors (Atom) */