[PATCH 2/9] traps: x86_64: make math_state_restore more like i386

From: Alexander van Heukelum
Date: Fri Oct 03 2008 - 18:27:17 EST


- rename variable me -> tsk
- get thread and tsk like i386
- expand used_math()
- copy comment

Signed-off-by: Alexander van Heukelum <heukelum@xxxxxxxxxxx>
---
arch/x86/kernel/traps_64.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
index 8cf590b..a7aef2d 100644
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -609,14 +609,15 @@ asmlinkage void __attribute__((weak)) mce_threshold_interrupt(void)
*/
asmlinkage void math_state_restore(void)
{
- struct task_struct *me = current;
+ struct thread_info *thread = current_thread_info();
+ struct task_struct *tsk = thread->task;

- if (!used_math()) {
+ if (!tsk_used_math(tsk)) {
local_irq_enable();
/*
* does a slab alloc which can sleep
*/
- if (init_fpu(me)) {
+ if (init_fpu(tsk)) {
/*
* ran out of memory!
*/
@@ -630,13 +631,13 @@ asmlinkage void math_state_restore(void)
/*
* Paranoid restore. send a SIGSEGV if we fail to restore the state.
*/
- if (unlikely(restore_fpu_checking(me))) {
+ if (unlikely(restore_fpu_checking(tsk))) {
stts();
- force_sig(SIGSEGV, me);
+ force_sig(SIGSEGV, tsk);
return;
}
- task_thread_info(me)->status |= TS_USEDFPU;
- me->fpu_counter++;
+ thread->status |= TS_USEDFPU; /* So we fnsave on switch_to() */
+ tsk->fpu_counter++;
}
EXPORT_SYMBOL_GPL(math_state_restore);

--
1.5.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/