aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 07:58:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 07:58:08 -0700
commit625037cc405eabbfd2a39e9297e583a94886225f (patch)
treec0a62f6cb2a565efb7cd494f558f0acbadcbabb0 /arch/x86/include
parent8fafa0a789faaff4318cbfa9c2f827d2198505dc (diff)
parent17950c5b243f99cbabef173415ee988c52104d7e (diff)
Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-64: move clts into batch cpu state updates when preloading fpu x86-64: move unlazy_fpu() into lazy cpu state part of context switch x86-32: make sure clts is batched during context switch x86: split out core __math_state_restore
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/i387.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
index fb7f0d64e14..0b20bbb758f 100644
--- a/arch/x86/include/asm/i387.h
+++ b/arch/x86/include/asm/i387.h
@@ -26,6 +26,7 @@ extern void fpu_init(void);
extern void mxcsr_feature_mask_init(void);
extern int init_fpu(struct task_struct *child);
extern asmlinkage void math_state_restore(void);
+extern void __math_state_restore(void);
extern void init_thread_xstate(void);
extern int dump_fpu(struct pt_regs *, struct user_i387_struct *);