Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66af8e27 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/fpu: Rename __thread_fpu_end() to fpregs_deactivate() 



Propagate the 'fpu->fpregs_active' naming to the high level function that
clears it.

Reviewed-by: default avatarBorislav 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: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 232f62cd

arch/x86/include/asm/fpu/internal.h

+7 −7
Original line number Diff line number Diff line
@@ -335,18 +335,18 @@ static inline void __fpregs_activate(struct fpu *fpu) 
 * These generally need preemption protection to work,

 * do try to avoid using these on their own.

 */

static inline void __thread_fpu_end(struct fpu *fpu)

static inline void fpregs_activate(struct fpu *fpu)

{

	__fpregs_deactivate(fpu);

	if (!use_eager_fpu())

		stts();

		clts();

	__fpregs_activate(fpu);

}



static inline void fpregs_activate(struct fpu *fpu)

static inline void fpregs_deactivate(struct fpu *fpu)

{

	__fpregs_deactivate(fpu);

	if (!use_eager_fpu())

		clts();

	__fpregs_activate(fpu);

		stts();

}



static inline void drop_fpu(struct fpu *fpu)
@@ -362,7 +362,7 @@ static inline void drop_fpu(struct fpu *fpu) 
		asm volatile("1: fwait\n"

			     "2:\n"

			     _ASM_EXTABLE(1b, 2b));

		__thread_fpu_end(fpu);

		fpregs_deactivate(fpu);

	}



	fpu->fpstate_active = 0;

arch/x86/kernel/fpu/core.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ void fpu__save(struct fpu *fpu) 
			__save_fpu(fpu);

		} else {

			fpu_save_init(fpu);

			__thread_fpu_end(fpu);

			fpregs_deactivate(fpu);

		}

	}

	preempt_enable();