Conflicts: arch/x86/events/intel/uncore.c
Showing the changes to include/linux (1 of 77 files). Show all
Unified · Split
| @@ -667,9 +667,7 @@ struct x86_cpu_id { · 666 unmodified lines | |||
| 667 | kernel_ulong_t driver_data; | 667 | kernel_ulong_t driver_data; |
| 668 | }; | 668 | }; |
| 669 | 669 | ||
| 670 | #define X86_FEATURE_MATCH(x) \ | 670 | /* Wild cards for x86_cpu_id::vendor, family, model and feature */ |
| 671 | { X86_VENDOR_ANY, X86_FAMILY_ANY, X86_MODEL_ANY, x } | ||
| 672 | |||
| 673 | #define X86_VENDOR_ANY 0xffff | 671 | #define X86_VENDOR_ANY 0xffff |
| 674 | #define X86_FAMILY_ANY 0 | 672 | #define X86_FAMILY_ANY 0 |
| 675 | #define X86_MODEL_ANY 0 | 673 | #define X86_MODEL_ANY 0 |