From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933206AbcA2STk (ORCPT ); Fri, 29 Jan 2016 13:19:40 -0500 Received: from mail-ob0-f195.google.com ([209.85.214.195]:34742 "EHLO mail-ob0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756739AbcA2STO (ORCPT ); Fri, 29 Jan 2016 13:19:14 -0500 From: Jeffrey Merkey To: hpa@zytor.com, jason.wessel@windriver.com, jeffmerkey@gmail.com, kgdb-bugreport@lists.sourceforge.net, linux-kernel@vger.kernel.org, mingo@redhat.com, tglx@linutronix.de, x86@kernel.org Subject: [PATCH 4/4] Fix kgdb/kdb to conform to int3 format Date: Fri, 29 Jan 2016 11:19:11 -0700 Message-Id: <1454091551-12819-1-git-send-email-jeffmerkey@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If a breakpoint is triggered under x86 with an int3 that kdb does not know about, it will report it as a catastrophic error rather than just assuming it was told to enter the debugger. The macro that defines the kgdb breakpoint also needs to conform to the newer gas format without the numbers. Signed-off-by: Jeffrey Merkey --- arch/x86/include/asm/kgdb.h | 2 +- kernel/debug/kdb/kdb_debugger.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/kgdb.h b/arch/x86/include/asm/kgdb.h index 332f98c..e24908a 100644 --- a/arch/x86/include/asm/kgdb.h +++ b/arch/x86/include/asm/kgdb.h @@ -77,7 +77,7 @@ enum regnames { static inline void arch_kgdb_breakpoint(void) { - asm(" int $3"); + asm volatile("int3"); } #define BREAK_INSTR_SIZE 1 #define CACHE_FLUSH_IS_SAFE 1 diff --git a/kernel/debug/kdb/kdb_debugger.c b/kernel/debug/kdb/kdb_debugger.c index 15e1a7a..d9b944d 100644 --- a/kernel/debug/kdb/kdb_debugger.c +++ b/kernel/debug/kdb/kdb_debugger.c @@ -55,7 +55,7 @@ int kdb_stub(struct kgdb_state *ks) int error = 0; kdb_bp_t *bp; unsigned long addr = kgdb_arch_pc(ks->ex_vector, ks->linux_regs); - kdb_reason_t reason = KDB_REASON_OOPS; + kdb_reason_t reason = KDB_REASON_KEYBOARD; kdb_dbtrap_t db_result = KDB_DB_NOBPT; int i; -- 1.8.3.1