diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-08-14 08:36:12 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-08-14 08:36:12 +0100 |
| commit | e49d3624a1e15abea48aeb5b1b74c2e2f2b22803 (patch) | |
| tree | 1080004c68676e8b09646e7cd93543465512d994 /xen/arch/x86/x86_64/traps.c | |
| parent | f2bb9f1b6e738c3fc1a419cea7d973d542caf864 (diff) | |
| download | xen-e49d3624a1e15abea48aeb5b1b74c2e2f2b22803.tar.gz xen-e49d3624a1e15abea48aeb5b1b74c2e2f2b22803.tar.bz2 xen-e49d3624a1e15abea48aeb5b1b74c2e2f2b22803.zip | |
x86: Remove EF_* duplicate defs for X86_EFLAGS_*.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/arch/x86/x86_64/traps.c')
| -rw-r--r-- | xen/arch/x86/x86_64/traps.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 4c74785c74..e1c65ee53f 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -296,7 +296,8 @@ unsigned long do_iret(void) regs->rip = iret_saved.rip; regs->cs = iret_saved.cs | 3; /* force guest privilege */ - regs->rflags = (iret_saved.rflags & ~(EF_IOPL|EF_VM)) | EF_IE; + regs->rflags = ((iret_saved.rflags & ~(X86_EFLAGS_IOPL|X86_EFLAGS_VM)) + | X86_EFLAGS_IF); regs->rsp = iret_saved.rsp; regs->ss = iret_saved.ss | 3; /* force guest privilege */ @@ -359,7 +360,7 @@ end: v->trap_priority = v->old_trap_priority; /* Restore upcall mask from supplied EFLAGS.IF. */ - vcpu_info(v, evtchn_upcall_mask) = !(iret_saved.rflags & EF_IE); + vcpu_info(v, evtchn_upcall_mask) = !(iret_saved.rflags & X86_EFLAGS_IF); /* Saved %rax gets written back to regs->rax in entry.S. */ return iret_saved.rax; @@ -464,7 +465,10 @@ void __devinit subarch_percpu_traps_init(void) /* Common SYSCALL parameters. */ wrmsr(MSR_STAR, 0, (FLAT_RING3_CS32<<16) | __HYPERVISOR_CS); - wrmsr(MSR_SYSCALL_MASK, EF_VM|EF_RF|EF_NT|EF_DF|EF_IE|EF_TF, 0U); + wrmsr(MSR_SYSCALL_MASK, + X86_EFLAGS_VM|X86_EFLAGS_RF|X86_EFLAGS_NT| + X86_EFLAGS_DF|X86_EFLAGS_IF|X86_EFLAGS_TF, + 0U); } void init_int80_direct_trap(struct vcpu *v) |