aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-02-13 16:47:25 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-29 19:34:22 -0500
commit454d147172263d0b022f32b86336f92243f89158 (patch)
treec787977a55984b1eecb47bcfb44f09a3de970765 /arch/x86/kernel
parentac29c0aeddba8f83dd73ec8a51c72f268c9b7b81 (diff)
i387: math_state_restore() isn't called from asm
commit be98c2cdb15ba26148cd2bd58a857d4f7759ed38 upstream. It was marked asmlinkage for some really old and stale legacy reasons. Fix that and the equally stale comment. Noticed when debugging the irq_fpu_usable() bugs. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/traps.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index b9b67166f9d..5878de3fb08 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -745,10 +745,10 @@ void __math_state_restore(void)
745 * Careful.. There are problems with IBM-designed IRQ13 behaviour. 745 * Careful.. There are problems with IBM-designed IRQ13 behaviour.
746 * Don't touch unless you *really* know how it works. 746 * Don't touch unless you *really* know how it works.
747 * 747 *
748 * Must be called with kernel preemption disabled (in this case, 748 * Must be called with kernel preemption disabled (eg with local
749 * local interrupts are disabled at the call-site in entry.S). 749 * local interrupts as in the case of do_device_not_available).
750 */ 750 */
751asmlinkage void math_state_restore(void) 751void math_state_restore(void)
752{ 752{
753 struct thread_info *thread = current_thread_info(); 753 struct thread_info *thread = current_thread_info();
754 struct task_struct *tsk = thread->task; 754 struct task_struct *tsk = thread->task;