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

Commit afcbf13f authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86: Rename X86_CR4_RDWRGSFS to X86_CR4_FSGSBASE 



Rename X86_CR4_RDWRGSFS to X86_CR4_FSGSBASE to match the SDM.

Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Link: http://lkml.kernel.org/n/tip-buq1evi5dpykxx7ak6amaam0@git.kernel.org
parent 1adfa76a

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
	(~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\

			  | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE     \

			  | X86_CR4_PGE | X86_CR4_PCE | X86_CR4_OSFXSR | X86_CR4_PCIDE \

			  | X86_CR4_OSXSAVE | X86_CR4_SMEP | X86_CR4_RDWRGSFS \

			  | X86_CR4_OSXSAVE | X86_CR4_SMEP | X86_CR4_FSGSBASE \

			  | X86_CR4_OSXMMEXCPT | X86_CR4_VMXE))



#define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)

arch/x86/include/uapi/asm/processor-flags.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
#define X86_CR4_OSFXSR	0x00000200 /* enable fast FPU save and restore */

#define X86_CR4_OSXMMEXCPT 0x00000400 /* enable unmasked SSE exceptions */

#define X86_CR4_VMXE	0x00002000 /* enable VMX virtualization */

#define X86_CR4_RDWRGSFS 0x00010000 /* enable RDWRGSFS support */

#define X86_CR4_FSGSBASE 0x00010000 /* enable RDWRGSFS support */

#define X86_CR4_PCIDE	0x00020000 /* enable PCID support */

#define X86_CR4_OSXSAVE 0x00040000 /* enable xsave and xrestore */

#define X86_CR4_SMEP	0x00100000 /* enable SMEP support */

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) 
	if (!guest_cpuid_has_smep(vcpu) && (cr4 & X86_CR4_SMEP))

		return 1;



	if (!guest_cpuid_has_fsgsbase(vcpu) && (cr4 & X86_CR4_RDWRGSFS))

	if (!guest_cpuid_has_fsgsbase(vcpu) && (cr4 & X86_CR4_FSGSBASE))

		return 1;



	if (is_long_mode(vcpu)) {