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

Commit befc61ad authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/fpu: Move asm/xcr.h to asm/fpu/internal.h 



Now that all FPU internals using drivers are converted to public APIs,
move xcr.h's definitions into fpu/internal.h and remove xcr.h.

Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
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 57dd083e

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

+25 −0
Original line number Diff line number Diff line
@@ -430,6 +430,31 @@ static inline void fpu_reset_state(struct fpu *fpu) 
		restore_init_xstate();

}



/*

 * Definitions for the eXtended Control Register instructions

 */



#define XCR_XFEATURE_ENABLED_MASK	0x00000000



static inline u64 xgetbv(u32 index)

{

	u32 eax, edx;



	asm volatile(".byte 0x0f,0x01,0xd0" /* xgetbv */

		     : "=a" (eax), "=d" (edx)

		     : "c" (index));

	return eax + ((u64)edx << 32);

}



static inline void xsetbv(u32 index, u64 value)

{

	u32 eax = value;

	u32 edx = value >> 32;



	asm volatile(".byte 0x0f,0x01,0xd1" /* xsetbv */

		     : : "a" (eax), "d" (edx), "c" (index));

}



/*

 * FPU state switching for scheduling.

 *

arch/x86/include/asm/xcr.h

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
/* -*- linux-c -*- ------------------------------------------------------- *

 *

 *   Copyright 2008 rPath, Inc. - All Rights Reserved

 *

 *   This file is part of the Linux kernel, and is made available under

 *   the terms of the GNU General Public License version 2 or (at your

 *   option) any later version; incorporated herein by reference.

 *

 * ----------------------------------------------------------------------- */



/*

 * asm-x86/xcr.h

 *

 * Definitions for the eXtended Control Register instructions

 */



#ifndef _ASM_X86_XCR_H

#define _ASM_X86_XCR_H



#define XCR_XFEATURE_ENABLED_MASK	0x00000000



#ifdef __KERNEL__

# ifndef __ASSEMBLY__



#include <linux/types.h>



static inline u64 xgetbv(u32 index)

{

	u32 eax, edx;



	asm volatile(".byte 0x0f,0x01,0xd0" /* xgetbv */

		     : "=a" (eax), "=d" (edx)

		     : "c" (index));

	return eax + ((u64)edx << 32);

}



static inline void xsetbv(u32 index, u64 value)

{

	u32 eax = value;

	u32 edx = value >> 32;



	asm volatile(".byte 0x0f,0x01,0xd1" /* xsetbv */

		     : : "a" (eax), "d" (edx), "c" (index));

}



# endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */



#endif /* _ASM_X86_XCR_H */

arch/x86/kernel/fpu/xstate.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <asm/fpu/internal.h>

#include <asm/sigframe.h>

#include <asm/tlbflush.h>

#include <asm/xcr.h>



static const char *xfeature_names[] =

{

arch/x86/kvm/vmx.c

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include <asm/virtext.h>

#include <asm/mce.h>

#include <asm/fpu/internal.h>

#include <asm/xcr.h>

#include <asm/perf_event.h>

#include <asm/debugreg.h>

#include <asm/kexec.h>

arch/x86/kvm/x86.c

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ 
#include <asm/mce.h>

#include <linux/kernel_stat.h>

#include <asm/fpu/internal.h> /* Ugh! */

#include <asm/xcr.h>

#include <asm/pvclock.h>

#include <asm/div64.h>