kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2020-03-25 15:20:44 +01:00
commit 629b3df7ec
77 changed files with 526 additions and 475 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/mod_devicetable.h
View file

@ -667,9 +667,7 @@ struct x86_cpu_id {
kernel_ulong_t driver_data;
};
#define X86_FEATURE_MATCH(x) \
{ X86_VENDOR_ANY, X86_FAMILY_ANY, X86_MODEL_ANY, x }
/* Wild cards for x86_cpu_id::vendor, family, model and feature */
#define X86_VENDOR_ANY 0xffff
#define X86_FAMILY_ANY 0
#define X86_MODEL_ANY 0