diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 13:06:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 13:06:00 -0700 |
| commit | e990c77d06dbacc8e5c5edd2c4a1005d318a4fa6 (patch) | |
| tree | da0e56801bc28204ad3e51652d8e0393d7170060 /arch/x86/include | |
| parent | 2f0384e5fc4766ad909597547d0e2b716c036755 (diff) | |
| parent | d7acb92fea932ad2e7846480aeacddc2c03c8485 (diff) | |
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86-64, asm: If the assembler supports fxsave64, use it
i386: Make kernel_execve() suitable for stack unwinding
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/i387.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h index a73a8d5a5e69..70f105b352ee 100644 --- a/arch/x86/include/asm/i387.h +++ b/arch/x86/include/asm/i387.h @@ -175,7 +175,7 @@ static inline void fpu_fxsave(struct fpu *fpu) uses any extended registers for addressing, a second REX prefix will be generated (to the assembler, rex64 followed by semicolon is a separate instruction), and hence the 64-bitness is lost. */ -#if 0 +#ifdef CONFIG_AS_FXSAVEQ /* Using "fxsaveq %0" would be the ideal choice, but is only supported starting with gas 2.16. */ __asm__ __volatile__("fxsaveq %0" |