UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mmiotrace: cleanup 

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Ingo Molnar 2008-05-12 21:20:58 +02:00 committed by Thomas Gleixner
parent 801a175bf6
commit 4902316826
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/kernel/mmiotrace/kmmio.c
View File

@ -228,7 +228,7 @@ int kmmio_handler(struct pt_regs *regs, unsigned long addr)
ctx->fpage = faultpage; ctx->fpage = faultpage;
ctx->probe = get_kmmio_probe(addr); ctx->probe = get_kmmio_probe(addr);
ctx->saved_flags = (regs->flags & (TF_MASK|IF_MASK)); ctx->saved_flags = (regs->flags & (X86_EFLAGS_TF | X86_EFLAGS_IF));
ctx->addr = addr; ctx->addr = addr;
if (ctx->probe && ctx->probe->pre_handler) if (ctx->probe && ctx->probe->pre_handler)
@ -238,8 +238,8 @@ int kmmio_handler(struct pt_regs *regs, unsigned long addr)
* Enable single-stepping and disable interrupts for the faulting * Enable single-stepping and disable interrupts for the faulting
* context. Local interrupts must not get enabled during stepping. * context. Local interrupts must not get enabled during stepping.
*/ */
regs->flags |= TF_MASK; regs->flags |= X86_EFLAGS_TF;
regs->flags &= ~IF_MASK; regs->flags &= ~X86_EFLAGS_IF;
/* Now we set present bit in PTE and single step. */ /* Now we set present bit in PTE and single step. */
disarm_kmmio_fault_page(ctx->fpage->page, NULL); disarm_kmmio_fault_page(ctx->fpage->page, NULL);
@ -283,7 +283,7 @@ static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs)
arm_kmmio_fault_page(ctx->fpage->page, NULL); arm_kmmio_fault_page(ctx->fpage->page, NULL);
regs->flags &= ~TF_MASK; regs->flags &= ~X86_EFLAGS_TF;
regs->flags |= ctx->saved_flags; regs->flags |= ctx->saved_flags;
/* These were acquired in kmmio_handler(). */ /* These were acquired in kmmio_handler(). */
@ -297,7 +297,7 @@ static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs)
* will have TF set, in which case, continue the remaining processing * will have TF set, in which case, continue the remaining processing
* of do_debug, as if this is not a probe hit. * of do_debug, as if this is not a probe hit.
*/ */
if (!(regs->flags & TF_MASK)) if (!(regs->flags & X86_EFLAGS_TF))
ret = 1; ret = 1;
out: out:
put_cpu_var(kmmio_ctx); put_cpu_var(kmmio_ctx);