diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-13 13:47:25 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-27 10:25:52 -0800 |
| commit | 4733009df6d45db10f1f7551e65147576f224a06 (patch) | |
| tree | 9548b328aa4224ddab0aec2593800a2d09464cd5 /arch/x86/kernel/traps.c | |
| parent | 9d0231c207faeda051cf54c1a64e1a147d2187fa (diff) | |
| download | kernel_samsung_smdk4412-4733009df6d45db10f1f7551e65147576f224a06.zip kernel_samsung_smdk4412-4733009df6d45db10f1f7551e65147576f224a06.tar.gz kernel_samsung_smdk4412-4733009df6d45db10f1f7551e65147576f224a06.tar.bz2 | |
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/traps.c')
| -rw-r--r-- | arch/x86/kernel/traps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index a8e3eb8..727e6c1 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -590,10 +590,10 @@ void __math_state_restore(void) * Careful.. There are problems with IBM-designed IRQ13 behaviour. * Don't touch unless you *really* know how it works. * - * Must be called with kernel preemption disabled (in this case, - * local interrupts are disabled at the call-site in entry.S). + * Must be called with kernel preemption disabled (eg with local + * local interrupts as in the case of do_device_not_available). */ -asmlinkage void math_state_restore(void) +void math_state_restore(void) { struct thread_info *thread = current_thread_info(); struct task_struct *tsk = thread->task; |