From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756611Ab1JYOoY (ORCPT ); Tue, 25 Oct 2011 10:44:24 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:36804 "EHLO e36.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750968Ab1JYOoX (ORCPT ); Tue, 25 Oct 2011 10:44:23 -0400 Date: Tue, 25 Oct 2011 19:51:59 +0530 From: Srikar Dronamraju To: Peter Zijlstra , "H. Peter Anvin" Cc: Steven Rostedt , Linus Torvalds , Christoph Hellwig , Ananth N Mavinakayanahalli , Thomas Gleixner , Andi Kleen , Oleg Nesterov , Andrew Morton , Jim Keniston , Roland McGrath , Ingo Molnar , Alexander van Heukelum , LKML Subject: [RFC] [PATCH x86 2/2] Cleanup do_int3 Message-ID: <20111025142159.GB21225@linux.vnet.ibm.com> Reply-To: Srikar Dronamraju References: <20111025141812.GA21225@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20111025141812.GA21225@linux.vnet.ibm.com> User-Agent: Mutt/1.5.20 (2009-06-14) x-cbid: 11102514-3352-0000-0000-0000005E4919 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since there is a possibility of !KPROBES int3 listeners and since DIE_TRAP is currently not being used by anybody, notify all listeners with DIE_INT3. Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Srikar Dronamraju --- arch/x86/kernel/traps.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 6913369..c9a4be5 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -461,15 +461,10 @@ dotraplinkage void __kprobes do_int3(struct pt_regs *regs, long error_code) == NOTIFY_STOP) return; #endif /* CONFIG_KGDB_LOW_LEVEL_TRAP */ -#ifdef CONFIG_KPROBES + if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP) == NOTIFY_STOP) return; -#else - if (notify_die(DIE_TRAP, "int3", regs, error_code, 3, SIGTRAP) - == NOTIFY_STOP) - return; -#endif preempt_conditional_sti(regs); do_trap(3, SIGTRAP, "int3", regs, error_code, NULL);