diff options
| author | Suleiman Souhlal <suleiman@google.com> | 2022-11-17 18:19:20 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-23 07:53:43 +0100 |
| commit | 8627f766f42beefcce9979e6db44541cc651d521 (patch) | |
| tree | 42247a6dde0ed07ce8cf5eded7e3634e56760d4d /include/linux | |
| parent | 67b137bf0d9d096f86c8bfa175ca5ab3629369c9 (diff) | |
| download | linux-stable-8627f766f42beefcce9979e6db44541cc651d521.tar.gz linux-stable-8627f766f42beefcce9979e6db44541cc651d521.tar.bz2 linux-stable-8627f766f42beefcce9979e6db44541cc651d521.zip | |
Revert "x86/cpu: Add a steppings field to struct x86_cpu_id"
This reverts commit 6f2f28e71e6af993761b7a70bd2402a8d2096acf.
This is commit e9d7144597b10ff13ff2264c059f7d4a7fbc89ac upstream. Reverting this
commit makes the following patches apply cleanly. This patch is then reapplied.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Suleiman Souhlal <suleiman@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mod_devicetable.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 610cdf8082f2..c30839a15f50 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -621,10 +621,6 @@ struct mips_cdmm_device_id { /* * MODULE_DEVICE_TABLE expects this struct to be called x86cpu_device_id. * Although gcc seems to ignore this error, clang fails without this define. - * - * Note: The ordering of the struct is different from upstream because the - * static initializers in kernels < 5.7 still use C89 style while upstream - * has been converted to proper C99 initializers. */ #define x86cpu_device_id x86_cpu_id struct x86_cpu_id { @@ -633,7 +629,6 @@ struct x86_cpu_id { __u16 model; __u16 feature; /* bit index */ kernel_ulong_t driver_data; - __u16 steppings; }; #define X86_FEATURE_MATCH(x) \ @@ -642,7 +637,6 @@ struct x86_cpu_id { #define X86_VENDOR_ANY 0xffff #define X86_FAMILY_ANY 0 #define X86_MODEL_ANY 0 -#define X86_STEPPING_ANY 0 #define X86_FEATURE_ANY 0 /* Same as FPU, you can't test for that */ /* |