diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-13 18:02:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-13 18:02:22 -0400 |
| commit | b5c851a88a369854c04e511cefb84ea2d0cfa209 (patch) | |
| tree | 55084d3d51708f90f27d0a70db5ab63916942f14 /arch/x86/include/asm/xsave.h | |
| parent | eb02ce017dd83985041a7e54c6449f92d53b026f (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: merge latest tracing fixes to avoid conflicts in
kernel/trace/trace_events_filter.c with upcoming change
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/xsave.h')
| -rw-r--r-- | arch/x86/include/asm/xsave.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h index 08e9a1ac07a9..727acc152344 100644 --- a/arch/x86/include/asm/xsave.h +++ b/arch/x86/include/asm/xsave.h | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | #define XSTATE_FP 0x1 | 8 | #define XSTATE_FP 0x1 |
| 9 | #define XSTATE_SSE 0x2 | 9 | #define XSTATE_SSE 0x2 |
| 10 | #define XSTATE_YMM 0x4 | ||
| 10 | 11 | ||
| 11 | #define XSTATE_FPSSE (XSTATE_FP | XSTATE_SSE) | 12 | #define XSTATE_FPSSE (XSTATE_FP | XSTATE_SSE) |
| 12 | 13 | ||
| @@ -15,7 +16,7 @@ | |||
| 15 | /* | 16 | /* |
| 16 | * These are the features that the OS can handle currently. | 17 | * These are the features that the OS can handle currently. |
| 17 | */ | 18 | */ |
| 18 | #define XCNTXT_MASK (XSTATE_FP | XSTATE_SSE) | 19 | #define XCNTXT_MASK (XSTATE_FP | XSTATE_SSE | XSTATE_YMM) |
| 19 | 20 | ||
| 20 | #ifdef CONFIG_X86_64 | 21 | #ifdef CONFIG_X86_64 |
| 21 | #define REX_PREFIX "0x48, " | 22 | #define REX_PREFIX "0x48, " |