diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-20 12:08:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-20 12:08:12 -0400 |
| commit | 62d170290979e0bb805d969cca4ea852bdd45260 (patch) | |
| tree | 837372297501a2d144358b44e7db3f88c5612aa2 /arch/x86/include/asm/xsave.h | |
| parent | 8b5b94e4e9813cdd77103827f48d58c806ab45c6 (diff) | |
| parent | d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: We need the x86/uv updates from upstream, to queue up
dependent fix.
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, " |