History

Merge branch 'x86/cpu' into perf/core, to resolve conflict

Conflicts: arch/x86/events/intel/uncore.c

Ingo Molnar committed 6 years ago

Commit 629b3df2 parents 3442a9e d97828077 files · +532 −481Browse files

Showing the changes to include/linux (1 of 77 files). Show all

Unified · Split

include/linux/mod_devicetable.h+1−3
@@ -667,9 +667,7 @@ struct x86_cpu_id { · 666 unmodified lines
667667 kernel_ulong_t driver_data;
668668 };
669669
670−#define X86_FEATURE_MATCH(x) \
671− { X86_VENDOR_ANY, X86_FAMILY_ANY, X86_MODEL_ANY, x }
672−
670+/* Wild cards for x86_cpu_id::vendor, family, model and feature */
673671 #define X86_VENDOR_ANY 0xffff
674672 #define X86_FAMILY_ANY 0
675673 #define X86_MODEL_ANY 0