diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 13:34:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 13:34:32 -0700 |
| commit | b6f7e38dbb310557fe890b04b1a376c93f638c3b (patch) | |
| tree | 244aa0cac6ceedfd208438f9c741211842c1aa3b /arch/x86/kernel/process_64.c | |
| parent | 214515b5787a1035b2c8807abe8be569de63b2f6 (diff) | |
| parent | b2b57fe053c9cf8b8af5a0e826a465996afed0ff (diff) | |
| download | kernel_samsung_aries-b6f7e38dbb310557fe890b04b1a376c93f638c3b.zip kernel_samsung_aries-b6f7e38dbb310557fe890b04b1a376c93f638c3b.tar.gz kernel_samsung_aries-b6f7e38dbb310557fe890b04b1a376c93f638c3b.tar.bz2 | |
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, fpu: Merge fpu_save_init()
x86-32, fpu: Rewrite fpu_save_init()
x86, fpu: Remove PSHUFB_XMM5_* macros
x86, fpu: Remove unnecessary ifdefs from i387 code.
x86-32, fpu: Remove math_emulate stub
x86-64, fpu: Simplify constraints for fxsave/fxtstor
x86-64, fpu: Fix %cs value in convert_from_fxsr()
x86-64, fpu: Disable preemption when using TS_USEDFPU
x86, fpu: Merge __save_init_fpu()
x86, fpu: Merge tolerant_fwait()
x86, fpu: Merge fpu_init()
x86: Use correct type for %cr4
x86, xsave: Disable xsave in i387 emulation mode
Fixed up fxsaveq-induced conflict in arch/x86/include/asm/i387.h
Diffstat (limited to 'arch/x86/kernel/process_64.c')
| -rw-r--r-- | arch/x86/kernel/process_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 3d9ea53..b3d7a3a 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -424,7 +424,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) load_TLS(next, cpu); /* Must be after DS reload */ - unlazy_fpu(prev_p); + __unlazy_fpu(prev_p); /* Make sure cpu is ready for new context */ if (preload_fpu) |