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

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

x86, flags: Rename X86_EFLAGS_BIT1 to X86_EFLAGS_FIXED 



Bit 1 in the x86 EFLAGS is always set.  Name the macro something that
actually tries to explain what it is all about, rather than being a
tautology.

Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Gleb Natapov <gleb@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Link: http://lkml.kernel.org/n/tip-f10rx5vjjm6tfnt8o1wseb3v@git.kernel.org
parent 2fc016c5

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

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * EFLAGS bits

 */

#define X86_EFLAGS_CF	0x00000001 /* Carry Flag */

#define X86_EFLAGS_BIT1	0x00000002 /* Bit 1 - always on */

#define X86_EFLAGS_FIXED 0x00000002 /* Bit 1 - always on */

#define X86_EFLAGS_PF	0x00000004 /* Parity Flag */

#define X86_EFLAGS_AF	0x00000010 /* Auxiliary carry Flag */

#define X86_EFLAGS_ZF	0x00000040 /* Zero Flag */

arch/x86/kernel/entry_64.S

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ ENDPROC(native_usergs_sysret64) 
	/*CFI_REL_OFFSET	ss,0*/

	pushq_cfi %rax /* rsp */

	CFI_REL_OFFSET	rsp,0

	pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_BIT1) /* eflags - interrupts on */

	pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */

	/*CFI_REL_OFFSET	rflags,0*/

	pushq_cfi $__KERNEL_CS /* cs */

	/*CFI_REL_OFFSET	cs,0*/

arch/x86/kernel/process_32.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, 
		childregs->bp = arg;

		childregs->orig_ax = -1;

		childregs->cs = __KERNEL_CS | get_kernel_rpl();

		childregs->flags = X86_EFLAGS_IF | X86_EFLAGS_BIT1;

		childregs->flags = X86_EFLAGS_IF | X86_EFLAGS_FIXED;

		p->fpu_counter = 0;

		p->thread.io_bitmap_ptr = NULL;

		memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));

arch/x86/kernel/process_64.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, 
		childregs->bp = arg;

		childregs->orig_ax = -1;

		childregs->cs = __KERNEL_CS | get_kernel_rpl();

		childregs->flags = X86_EFLAGS_IF | X86_EFLAGS_BIT1;

		childregs->flags = X86_EFLAGS_IF | X86_EFLAGS_FIXED;

		return 0;

	}

	*childregs = *current_pt_regs();

arch/x86/kvm/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -7942,7 +7942,7 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu, 


	kvm_register_write(vcpu, VCPU_REGS_RSP, vmcs12->host_rsp);

	kvm_register_write(vcpu, VCPU_REGS_RIP, vmcs12->host_rip);

	vmx_set_rflags(vcpu, X86_EFLAGS_BIT1);

	vmx_set_rflags(vcpu, X86_EFLAGS_FIXED);

	/*

	 * Note that calling vmx_set_cr0 is important, even if cr0 hasn't

	 * actually changed, because it depends on the current state of