diff options
| author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-01-30 12:31:27 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 12:31:27 (GMT) |
| commit | 053de044411111da00272d1b4e174e7dd743f499 (patch) | |
| tree | be44ae9b0ed878df7b83daa39bb89e01f3fdbe73 /include | |
| parent | 73018a66e70fa631935192e5ed6ef8fa2d20b22d (diff) | |
| download | linux-053de044411111da00272d1b4e174e7dd743f499.tar.xz | |
x86: get rid of _MASK flags
There's no need for the *_MASK flags (TF_MASK, IF_MASK, etc), found in
processor.h (both _32 and _64). They have a one-to-one mapping with the
EFLAGS value. This patch removes the definitions, and use the already
existent X86_EFLAGS_ version when applicable.
[ roland@redhat.com: KVM build fixes. ]
Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/kprobes.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/processor.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/processor_32.h | 1 | ||||
| -rw-r--r-- | include/asm-x86/processor_64.h | 11 |
4 files changed, 3 insertions, 13 deletions
diff --git a/include/asm-x86/kprobes.h b/include/asm-x86/kprobes.h index 6e6371a..143476a 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 dea81b7..e8dd394 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 76cada9..b9dbe46 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 a0a9e55..c49716a 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; |