diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-08-24 16:32:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-08-24 16:32:24 -0400 |
| commit | 83bc90e11576f9c100f8ef4ba2bcd0b89212e3fb (patch) | |
| tree | e59186b4d315c80255851e0d204143ecc21399a0 /arch/x86/include/asm/processor.h | |
| parent | e21ded5ecc531a64d6fc0c1693285e890b4e9569 (diff) | |
| parent | 451fd72219dd6f3355e2d036c598544c760ee532 (diff) | |
Merge branch 'linus' into perf/core, to fix conflicts
Conflicts:
arch/x86/kernel/cpu/perf_event_intel_uncore*.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index ee30b9f0b91c..eb71ec794732 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h | |||
| @@ -385,8 +385,8 @@ struct bndcsr_struct { | |||
| 385 | 385 | ||
| 386 | struct xsave_hdr_struct { | 386 | struct xsave_hdr_struct { |
| 387 | u64 xstate_bv; | 387 | u64 xstate_bv; |
| 388 | u64 reserved1[2]; | 388 | u64 xcomp_bv; |
| 389 | u64 reserved2[5]; | 389 | u64 reserved[6]; |
| 390 | } __attribute__((packed)); | 390 | } __attribute__((packed)); |
| 391 | 391 | ||
| 392 | struct xsave_struct { | 392 | struct xsave_struct { |