diff options
author | 2020-03-25 15:20:44 +0100 | |
---|---|---|
committer | 2020-03-25 15:20:44 +0100 | |
commit | 629b3df7ecb01fddfdf71cb5d3c563d143117c33 (patch) | |
tree | a2e5ad1266c9660c934b9bf7a1621f6a3a48e28b /arch/x86/kernel/cpu/match.c | |
parent | perf/x86/intel/uncore: Factor out __snr_uncore_mmio_init_box (diff) | |
parent | cpufreq/intel_pstate: Fix wrong macro conversion (diff) | |
download | linux-629b3df7ecb01fddfdf71cb5d3c563d143117c33.tar.gz linux-629b3df7ecb01fddfdf71cb5d3c563d143117c33.tar.bz2 linux-629b3df7ecb01fddfdf71cb5d3c563d143117c33.zip |
Merge branch 'x86/cpu' into perf/core, to resolve conflict
Conflicts:
arch/x86/events/intel/uncore.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/match.c')
-rw-r--r-- | arch/x86/kernel/cpu/match.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/match.c b/arch/x86/kernel/cpu/match.c index 6dd78d8235e4..d3482eb43ff3 100644 --- a/arch/x86/kernel/cpu/match.c +++ b/arch/x86/kernel/cpu/match.c @@ -16,12 +16,17 @@ * respective wildcard entries. * * A typical table entry would be to match a specific CPU - * { X86_VENDOR_INTEL, 6, 0x12 } - * or to match a specific CPU feature - * { X86_FEATURE_MATCH(X86_FEATURE_FOOBAR) } + * + * X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_BROADWELL, + * X86_FEATURE_ANY, NULL); * * Fields can be wildcarded with %X86_VENDOR_ANY, %X86_FAMILY_ANY, - * %X86_MODEL_ANY, %X86_FEATURE_ANY or 0 (except for vendor) + * %X86_MODEL_ANY, %X86_FEATURE_ANY (except for vendor) + * + * asm/cpu_device_id.h contains a set of useful macros which are shortcuts + * for various common selections. The above can be shortened to: + * + * X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, NULL); * * Arrays used to match for this should also be declared using * MODULE_DEVICE_TABLE(x86cpu, ...) |