9 files changed, 21 insertions, 31 deletions

diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index d03d43f32f4c..0e24e3fda3d7 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -501,7 +501,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
         regs->ss = __USER32_DS;
 
         set_fs(USER_DS);
-        regs->flags &= ~TF_MASK;
+        regs->flags &= ~X86_EFLAGS_TF;
         if (test_thread_flag(TIF_SINGLESTEP))
                 ptrace_notify(SIGTRAP);
 
@@ -601,7 +601,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         regs->ss = __USER32_DS;
 
         set_fs(USER_DS);
-        regs->flags &= ~TF_MASK;
+        regs->flags &= ~X86_EFLAGS_TF;
         if (test_thread_flag(TIF_SINGLESTEP))
                 ptrace_notify(SIGTRAP);
 
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index 9aadd4d4a229..8de82c8cedd6 100644
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -387,9 +387,9 @@ static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs,
 {
         __get_cpu_var(current_kprobe) = p;
         kcb->kprobe_saved_flags = kcb->kprobe_old_flags
-                = (regs->flags & (TF_MASK | IF_MASK));
+                = (regs->flags & (X86_EFLAGS_TF | X86_EFLAGS_IF));
         if (is_IF_modifier(p->ainsn.insn))
-                kcb->kprobe_saved_flags &= ~IF_MASK;
+                kcb->kprobe_saved_flags &= ~X86_EFLAGS_IF;
 }
 
 static __always_inline void clear_btf(void)
@@ -407,8 +407,8 @@ static __always_inline void restore_btf(void)
 static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
 {
         clear_btf();
-        regs->flags |= TF_MASK;
-        regs->flags &= ~IF_MASK;
+        regs->flags |= X86_EFLAGS_TF;
+        regs->flags &= ~X86_EFLAGS_IF;
         /*single step inline if the instruction is an int3*/
         if (p->opcode == BREAKPOINT_INSTRUCTION)
                 regs->ip = (unsigned long)p->addr;
@@ -454,7 +454,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
                 if (p) {
                         if (kcb->kprobe_status == KPROBE_HIT_SS &&
                                 *p->ainsn.insn == BREAKPOINT_INSTRUCTION) {
-                                regs->flags &= ~TF_MASK;
+                                regs->flags &= ~X86_EFLAGS_TF;
                                 regs->flags |= kcb->kprobe_saved_flags;
                                 goto no_kprobe;
 #ifdef CONFIG_X86_64
@@ -749,10 +749,10 @@ static void __kprobes resume_execution(struct kprobe *p,
                 insn++;
 #endif
 
-        regs->flags &= ~TF_MASK;
+        regs->flags &= ~X86_EFLAGS_TF;
         switch (*insn) {
         case 0x9c:      /* pushfl */
-                *tos &= ~(TF_MASK | IF_MASK);
+                *tos &= ~(X86_EFLAGS_TF | X86_EFLAGS_IF);
                 *tos |= kcb->kprobe_old_flags;
                 break;
         case 0xc2:      /* iret/ret/lret */
@@ -852,7 +852,7 @@ out:
          * will have TF set, in which case, continue the remaining processing
          * of do_debug, as if this is not a probe hit.
          */
-        if (regs->flags & TF_MASK)
+        if (regs->flags & X86_EFLAGS_TF)
                 return 0;
 
         return 1;
@@ -982,7 +982,7 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
          */
         memcpy(kcb->jprobes_stack, (kprobe_opcode_t *)addr,
                MIN_STACK_SIZE(addr));
-        regs->flags &= ~IF_MASK;
+        regs->flags &= ~X86_EFLAGS_IF;
         trace_hardirqs_off();
         regs->ip = (unsigned long)(jp->entry);
         return 1;
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index 1c9bca56fb55..4eb751c60390 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -295,7 +295,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
            see include/asm-x86_64/uaccess.h for details. */
         set_fs(USER_DS);
 
-        regs->flags &= ~TF_MASK;
+        regs->flags &= ~X86_EFLAGS_TF;
         if (test_thread_flag(TIF_SINGLESTEP))
                 ptrace_notify(SIGTRAP);
 #ifdef DEBUG_SIG
@@ -463,7 +463,7 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)
                
         /* Pending single-step? */
         if (thread_info_flags & _TIF_SINGLESTEP) {
-                regs->flags |= TF_MASK;
+                regs->flags |= X86_EFLAGS_TF;
                 clear_thread_flag(TIF_SINGLESTEP);
         }
 
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
index cf90ceb48f5f..7118fa0320ae 100644
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -904,7 +904,7 @@ clear_dr7:
 
 clear_TF_reenable:
         set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
-        regs->flags &= ~TF_MASK;
+        regs->flags &= ~X86_EFLAGS_TF;
         preempt_conditional_cli(regs);
 }
 
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index bb56ae3f89b6..5b397b6c9f93 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -524,7 +524,7 @@ static unsigned long vmx_get_rflags(struct kvm_vcpu *vcpu)
 static void vmx_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)
 {
         if (vcpu->rmode.active)
-                rflags |= IOPL_MASK | X86_EFLAGS_VM;
+                rflags |= X86_EFLAGS_IOPL | X86_EFLAGS_VM;
         vmcs_writel(GUEST_RFLAGS, rflags);
 }
 
@@ -1050,7 +1050,7 @@ static void enter_pmode(struct kvm_vcpu *vcpu)
         vmcs_write32(GUEST_TR_AR_BYTES, vcpu->rmode.tr.ar);
 
         flags = vmcs_readl(GUEST_RFLAGS);
-        flags &= ~(IOPL_MASK | X86_EFLAGS_VM);
+        flags &= ~(X86_EFLAGS_IOPL | X86_EFLAGS_VM);
         flags |= (vcpu->rmode.save_iopl << IOPL_SHIFT);
         vmcs_writel(GUEST_RFLAGS, flags);
 
@@ -1107,9 +1107,9 @@ static void enter_rmode(struct kvm_vcpu *vcpu)
         vmcs_write32(GUEST_TR_AR_BYTES, 0x008b);
 
         flags = vmcs_readl(GUEST_RFLAGS);
-        vcpu->rmode.save_iopl = (flags & IOPL_MASK) >> IOPL_SHIFT;
+        vcpu->rmode.save_iopl = (flags & X86_EFLAGS_IOPL) >> IOPL_SHIFT;
 
-        flags |= IOPL_MASK | X86_EFLAGS_VM;
+        flags |= X86_EFLAGS_IOPL | X86_EFLAGS_VM;
 
         vmcs_writel(GUEST_RFLAGS, flags);
         vmcs_writel(GUEST_CR4, vmcs_readl(GUEST_CR4) | X86_CR4_VME);
diff --git a/include/asm-x86/kprobes.h b/include/asm-x86/kprobes.h
index 6e6371a856e7..143476a3cb52 100644
--- a/include/asm-x86/kprobes.h
+++ b/include/asm-x86/kprobes.h
@@ -88,7 +88,7 @@ struct kprobe_ctlblk {
  */
 static inline void restore_interrupts(struct pt_regs *regs)
 {
-        if (regs->flags & IF_MASK)
+        if (regs->flags & X86_EFLAGS_IF)
                 local_irq_enable();
 }
 
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
index dea81b70895d..e8dd394c9f46 100644
--- a/include/asm-x86/processor.h
+++ b/include/asm-x86/processor.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_X86_PROCESSOR_H
 #define __ASM_X86_PROCESSOR_H
 
+#include <asm/processor-flags.h>
+
 static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
                                          unsigned int *ecx, unsigned int *edx)
 {
diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h
index 76cada930d22..b9dbe4668e75 100644
--- a/include/asm-x86/processor_32.h
+++ b/include/asm-x86/processor_32.h
@@ -19,7 +19,6 @@
 #include <asm/percpu.h>
 #include <linux/cpumask.h>
 #include <linux/init.h>
-#include <asm/processor-flags.h>
 #include <asm/desc_defs.h>
 
 static inline int desc_empty(const void *ptr)
diff --git a/include/asm-x86/processor_64.h b/include/asm-x86/processor_64.h
index a0a9e5515097..c49716a76644 100644
--- a/include/asm-x86/processor_64.h
+++ b/include/asm-x86/processor_64.h
@@ -18,19 +18,8 @@
 #include <asm/percpu.h>
 #include <linux/personality.h>
 #include <linux/cpumask.h>
-#include <asm/processor-flags.h>
 #include <asm/desc_defs.h>
 
-#define TF_MASK         0x00000100
-#define IF_MASK         0x00000200
-#define IOPL_MASK       0x00003000
-#define NT_MASK         0x00004000
-#define VM_MASK         0x00020000
-#define AC_MASK         0x00040000
-#define VIF_MASK        0x00080000      /* virtual interrupt flag */
-#define VIP_MASK        0x00100000      /* virtual interrupt pending */
-#define ID_MASK         0x00200000
-
 static inline int desc_empty(const void *ptr)
 {
         const u32 *desc = ptr;