diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-08 18:41:58 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-08 18:41:58 -0400 |
| commit | 636c8a8d85d0564222071f0caa4a4e6bf527efe5 (patch) | |
| tree | f1958f80f596cfcf496904f12a62662fa79ce990 /arch/x86/include/asm/processor.h | |
| parent | 39ec5cbed0bb1878d0b65af0c5e653e37e1945a5 (diff) | |
| parent | d48d5691ebf88a15d95ba96486917ffc79256536 (diff) | |
Merge tag 'usb-serial-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.6-rc3
Here are some new device ids.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 983738ac014c..9264476f3d57 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h | |||
| @@ -132,8 +132,6 @@ struct cpuinfo_x86 { | |||
| 132 | u16 logical_proc_id; | 132 | u16 logical_proc_id; |
| 133 | /* Core id: */ | 133 | /* Core id: */ |
| 134 | u16 cpu_core_id; | 134 | u16 cpu_core_id; |
| 135 | /* Compute unit id */ | ||
| 136 | u8 compute_unit_id; | ||
| 137 | /* Index into per_cpu list: */ | 135 | /* Index into per_cpu list: */ |
| 138 | u16 cpu_index; | 136 | u16 cpu_index; |
| 139 | u32 microcode; | 137 | u32 microcode; |
