From dbadc830ac18a4ceb2078ca15835d67aebe4b908 Mon Sep 17 00:00:00 2001 From: Javi Merino Date: Mon, 6 Feb 2012 15:45:36 +0100 Subject: [PATCH] --- yaml --- r: 297591 b: refs/heads/master c: f5274c2d0d8d91076af8605187d762dfa0b92825 h: refs/heads/master i: 297589: a054d9e4d59ce4b9e88796044ef098f2f7f1bebf 297587: 9f8aeef3f37a99ccff450f42aa4b287ba55d5331 297583: a02866f87acd91860a7317e0188480e81fba9a08 v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/fault.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 57199e7920f3..203c85664055 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0b823e9a543527dbb0f806252ee03a60f2aefbc +refs/heads/master: f5274c2d0d8d91076af8605187d762dfa0b92825 diff --git a/trunk/arch/arm/mm/fault.c b/trunk/arch/arm/mm/fault.c index bb7eac381a8e..40c43a94ba72 100644 --- a/trunk/arch/arm/mm/fault.c +++ b/trunk/arch/arm/mm/fault.c @@ -164,7 +164,8 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr, struct siginfo si; #ifdef CONFIG_DEBUG_USER - if (user_debug & UDBG_SEGV) { + if (((user_debug & UDBG_SEGV) && (sig == SIGSEGV)) || + ((user_debug & UDBG_BUS) && (sig == SIGBUS))) { printk(KERN_DEBUG "%s: unhandled page fault (%d) at 0x%08lx, code 0x%03x\n", tsk->comm, sig, addr, fsr); show_pte(tsk->mm, addr);