Commit bf661987 authored Apr 27, 2006 by mao, bibo Committed by Linus Torvalds Apr 28, 2006

[PATCH] kprobe cleanup for VM_MASK judgement



When trap happens in user space, kprobe_exceptions_notify() funtion will
skip it.  This patch deletes some unnecessary code for VM_MASK judgement in
eflags.

Signed-off-by: bibo, mao <bibo.mao@intel.com>
Cc: Masami Hiramatsu <hiramatu@sdl.hitachi.co.jp>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Acked-by: "Keshavamurthy, Anil S" <anil.s.keshavamurthy@intel.com>
Acked-by: Prasanna S Panchamukhi <prasanna@in.ibm.com>
Cc: Jim Keniston <jkenisto@us.ibm.com>
Cc: Yumiko Sugita <sugita@sdl.hitachi.co.jp>
Cc: Satoshi Oshima <soshima@redhat.com>
Cc: Hideo Aoki <haoki@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 9539d4e7

arch/i386/kernel/kprobes.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -242,10 +242,6 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
		kcb->kprobe_status = KPROBE_REENTER;
		return 1;
		} else {
		if (regs->eflags & VM_MASK) {
		/* We are in virtual-8086 mode. Return 0 */
		goto no_kprobe;
		}
		if (*addr != BREAKPOINT_INSTRUCTION) {
		/* The breakpoint instruction was removed by
		* another cpu right after we hit, no further
		@@ -265,11 +261,6 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)

		p = get_kprobe(addr);
		if (!p) {
		if (regs->eflags & VM_MASK) {
		/* We are in virtual-8086 mode. Return 0 */
		goto no_kprobe;
		}

		if (*addr != BREAKPOINT_INSTRUCTION) {
		/*
		* The breakpoint instruction was removed right