diff options
author | Jesper Nilsson <jesper.nilsson@axis.com> | 2010-08-04 11:42:43 -0400 |
---|---|---|
committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2010-08-04 12:28:48 -0400 |
commit | b4e8a1813c7d65a7c28a3536da08444c21f2c37b (patch) | |
tree | 7b310dfaf31e41d6ff37a0cef2d271c1fca8003e /arch/cris/mm/fault.c | |
parent | 028c1f6817c1ef49c61641dc1ae6c629e5bb32df (diff) |
CRIS: Add config for pausing a seg-faulting process
Put it on a wait queue, so we can attach gdb to the process
to debug it instead of just killing it.
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/mm/fault.c')
-rw-r--r-- | arch/cris/mm/fault.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c index a2b4c0b8f0fd..7705cd7cef36 100644 --- a/arch/cris/mm/fault.c +++ b/arch/cris/mm/fault.c | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <linux/mm.h> | 7 | #include <linux/mm.h> |
8 | #include <linux/interrupt.h> | 8 | #include <linux/interrupt.h> |
9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
10 | #include <linux/wait.h> | ||
10 | #include <asm/uaccess.h> | 11 | #include <asm/uaccess.h> |
11 | 12 | ||
12 | extern int find_fixup_code(struct pt_regs *); | 13 | extern int find_fixup_code(struct pt_regs *); |
@@ -190,14 +191,20 @@ do_page_fault(unsigned long address, struct pt_regs *regs, | |||
190 | /* User mode accesses just cause a SIGSEGV */ | 191 | /* User mode accesses just cause a SIGSEGV */ |
191 | 192 | ||
192 | if (user_mode(regs)) { | 193 | if (user_mode(regs)) { |
194 | printk(KERN_NOTICE "%s (pid %d) segfaults for page " | ||
195 | "address %08lx at pc %08lx\n", | ||
196 | tsk->comm, tsk->pid, | ||
197 | address, instruction_pointer(regs)); | ||
198 | #ifdef CONFIG_NO_SEGFAULT_TERMINATION | ||
199 | DECLARE_WAIT_QUEUE_HEAD(wq); | ||
200 | wait_event_interruptible(wq, 0 == 1); | ||
201 | #else | ||
193 | info.si_signo = SIGSEGV; | 202 | info.si_signo = SIGSEGV; |
194 | info.si_errno = 0; | 203 | info.si_errno = 0; |
195 | /* info.si_code has been set above */ | 204 | /* info.si_code has been set above */ |
196 | info.si_addr = (void *)address; | 205 | info.si_addr = (void *)address; |
197 | force_sig_info(SIGSEGV, &info, tsk); | 206 | force_sig_info(SIGSEGV, &info, tsk); |
198 | printk(KERN_NOTICE "%s (pid %d) segfaults for page " | 207 | #endif |
199 | "address %08lx at pc %08lx\n", | ||
200 | tsk->comm, tsk->pid, address, instruction_pointer(regs)); | ||
201 | return; | 208 | return; |
202 | } | 209 | } |
203 | 210 | ||