Merge 458ef2a25e
Merge tag 'x86-timers-2020-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into android-mainline
In a quest to make the huge -rc1 merge easier to handle and bisect, merge the first chunk of 5.7-rc1 patches into android-mainline. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ib54436e9515660a4c0c25c49c21bfb399eb57921
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user