lkml.org 
[lkml]   [2015]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 092/208] x86/fpu: Rename __thread_fpu_begin() to fpregs_activate()
Date
Propagate the 'fpu->fpregs_active' naming to the high level
function that sets it.

Reviewed-by: Borislav Petkov <bp@alien8.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/include/asm/fpu/internal.h | 6 +++---
arch/x86/kernel/fpu/core.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h
index 7a235171be6c..18a62239c73d 100644
--- a/arch/x86/include/asm/fpu/internal.h
+++ b/arch/x86/include/asm/fpu/internal.h
@@ -342,7 +342,7 @@ static inline void __thread_fpu_end(struct fpu *fpu)
stts();
}

-static inline void __thread_fpu_begin(struct fpu *fpu)
+static inline void fpregs_activate(struct fpu *fpu)
{
if (!use_eager_fpu())
clts();
@@ -441,7 +441,7 @@ switch_fpu_prepare(struct fpu *old_fpu, struct fpu *new_fpu, int cpu)
fpu.preload = 0;
else
prefetch(new_fpu->state);
- __thread_fpu_begin(new_fpu);
+ fpregs_activate(new_fpu);
}
}
return fpu;
@@ -499,7 +499,7 @@ static inline void user_fpu_begin(void)

preempt_disable();
if (!user_has_fpu())
- __thread_fpu_begin(fpu);
+ fpregs_activate(fpu);
preempt_enable();
}

diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
index a7fb56266a2d..75b94985c82e 100644
--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -368,9 +368,9 @@ void fpu__restore(void)
local_irq_disable();
}

- /* Avoid __kernel_fpu_begin() right after __thread_fpu_begin() */
+ /* Avoid __kernel_fpu_begin() right after fpregs_activate() */
kernel_fpu_disable();
- __thread_fpu_begin(fpu);
+ fpregs_activate(fpu);
if (unlikely(restore_fpu_checking(fpu))) {
fpu_reset_state(fpu);
force_sig_info(SIGSEGV, SEND_SIG_PRIV, tsk);
--
2.1.0


\
 
 \ /
  Last update: 2015-05-05 21:01    [W:0.411 / U:0.512 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site