2007-11-28 05:08:33

by Roland McGrath

Subject: [PATCH 1/2] x86: setup64 eflags constants

This cleans up arch/x86/kernel/setup64.c to use the X86_EFLAGS_* constants
from <asm/processor-flags.h> instead of the EF_* enum in <asm/ptrace.h>.

Signed-off-by: Roland McGrath <[email protected]>
---
arch/x86/kernel/setup64.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c
index 3558ac7..51297cc 100644
--- a/arch/x86/kernel/setup64.c
+++ b/arch/x86/kernel/setup64.c
@@ -169,7 +169,8 @@ void syscall_init(void)
#endif

/* Flags to clear on syscall */
- wrmsrl(MSR_SYSCALL_MASK, EF_TF|EF_DF|EF_IE|0x3000);
+ wrmsrl(MSR_SYSCALL_MASK,
+ X86_EFLAGS_TF|X86_EFLAGS_DF|X86_EFLAGS_IF|X86_EFLAGS_IOPL);
}

void __cpuinit check_efer(void)

2007-11-28 05:09:57

by Roland McGrath

Subject: [PATCH 2/2] x86: eflags enum

This removes the EF_* enum from <asm/ptrace.h>. It is no longer used,
and duplicates the X86_EFLAGS_* constants from <asm/processor-flags.h>.

Signed-off-by: Roland McGrath <[email protected]>
---
include/asm-x86/ptrace.h | 22 ----------------------
1 files changed, 0 insertions(+), 22 deletions(-)

diff --git a/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h
index 04204f3..5d73bfc 100644
--- a/include/asm-x86/ptrace.h
+++ b/include/asm-x86/ptrace.h
@@ -116,28 +116,6 @@ extern int ptrace_set_debugreg(struct task_struct *child, int n, unsigned long);
extern unsigned long
convert_rip_to_linear(struct task_struct *child, struct pt_regs *regs);

-enum {
- EF_CF = 0x00000001,
- EF_PF = 0x00000004,
- EF_AF = 0x00000010,
- EF_ZF = 0x00000040,
- EF_SF = 0x00000080,
- EF_TF = 0x00000100,
- EF_IE = 0x00000200,
- EF_DF = 0x00000400,
- EF_OF = 0x00000800,
- EF_IOPL = 0x00003000,
- EF_IOPL_RING0 = 0x00000000,
- EF_IOPL_RING1 = 0x00001000,
- EF_IOPL_RING2 = 0x00002000,
- EF_NT = 0x00004000, /* nested task */
- EF_RF = 0x00010000, /* resume */
- EF_VM = 0x00020000, /* virtual mode */
- EF_AC = 0x00040000, /* alignment */
- EF_VIF = 0x00080000, /* virtual interrupt */
- EF_VIP = 0x00100000, /* virtual interrupt pending */
- EF_ID = 0x00200000, /* id */
-};
#endif /* __KERNEL__ */
#endif /* !__i386__ */

2007-11-28 11:14:21

by Ingo Molnar

Subject: Re: [PATCH 1/2] x86: setup64 eflags constants

* Roland McGrath <[email protected]> wrote:

> This cleans up arch/x86/kernel/setup64.c to use the X86_EFLAGS_* constants
> from <asm/processor-flags.h> instead of the EF_* enum in <asm/ptrace.h>.

thanks, added. (queued to after the ptrace patches in x86.git)

Ingo

2007-11-28 11:14:35

by Ingo Molnar

Subject: Re: [PATCH 2/2] x86: eflags enum

* Roland McGrath <[email protected]> wrote:

> This removes the EF_* enum from <asm/ptrace.h>. It is no longer used,
> and duplicates the X86_EFLAGS_* constants from
> <asm/processor-flags.h>.
>
> Signed-off-by: Roland McGrath <[email protected]>

thanks, added. (queued to after the ptrace patches in x86.git)

Ingo