Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 35701
b: refs/heads/master
c: 6edf428
h: refs/heads/master
i:
  35699: 33a39e1
v: v3
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Sep 26, 2006
1 parent 3c84814 commit cafe93e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6b7aaad9ba4f2a059a70014be12a921eceebfc47
refs/heads/master: 6edf428ed177e333863a8e5c37751a9ec176f241
11 changes: 9 additions & 2 deletions trunk/arch/um/kernel/trap.c
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,16 @@ void bad_segv(struct faultinfo fi, unsigned long ip)

void relay_signal(int sig, union uml_pt_regs *regs)
{
if(arch_handle_signal(sig, regs)) return;
if(!UPT_IS_USER(regs))
if(arch_handle_signal(sig, regs))
return;

if(!UPT_IS_USER(regs)){
if(sig == SIGBUS)
printk("Bus error - the /dev/shm or /tmp mount likely "
"just ran out of space\n");
panic("Kernel mode signal %d", sig);
}

current->thread.arch.faultinfo = *UPT_FAULTINFO(regs);
force_sig(sig, current);
}
Expand Down

0 comments on commit cafe93e

Please sign in to comment.