diff options
| author | Suraj Jitindar Singh <surajjs@amazon.com> | 2022-10-27 13:54:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-01 19:14:44 +0100 |
| commit | 6fde716d079f1291103ebe220bff9ed51b05ad5f (patch) | |
| tree | 6b5683692940331db63c787a4c876867bd720987 /include/linux | |
| parent | 41f36d7859a79e11a13ef63ced8ae8cc31537ba2 (diff) | |
| download | linux-stable-6fde716d079f1291103ebe220bff9ed51b05ad5f.tar.gz linux-stable-6fde716d079f1291103ebe220bff9ed51b05ad5f.tar.bz2 linux-stable-6fde716d079f1291103ebe220bff9ed51b05ad5f.zip | |
Revert "x86/cpu: Add a steppings field to struct x86_cpu_id"
This reverts commit ae585de4296413ae4bbb8f2ac09faa38ff78f4cd.
This is commit e9d7144597b10ff13ff2264c059f7d4a7fbc89ac upstream. Reverting this
commit makes the following patches apply cleanly. This patch is then reapplied.
Signed-off-by: Suraj Jitindar Singh <surajjs@amazon.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 6f8eb1238235..f3c631fe076a 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -589,10 +589,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 { @@ -601,7 +597,6 @@ struct x86_cpu_id { __u16 model; __u16 feature; /* bit index */ kernel_ulong_t driver_data; - __u16 steppings; }; #define X86_FEATURE_MATCH(x) \ @@ -610,7 +605,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 */ /* |