Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88880
b: refs/heads/master
c: 0f54091
h: refs/heads/master
v: v3
  • Loading branch information
Roland McGrath authored and Ingo Molnar committed Apr 17, 2008
1 parent 51e73c1 commit 08fddf5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 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: b00de174e3d52d9185e2e9937a6a2704c9d7d520
refs/heads/master: 0f54091051c450bab751c3ca0cb45d61a67a683b
9 changes: 1 addition & 8 deletions trunk/arch/x86/kernel/vm86_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -557,16 +557,9 @@ int handle_vm86_trap(struct kernel_vm86_regs *regs, long error_code, int trapno)
}
if (trapno != 1)
return 1; /* we let this handle by the calling routine */
if (current->ptrace & PT_PTRACED) {
unsigned long flags;
spin_lock_irqsave(&current->sighand->siglock, flags);
sigdelset(&current->blocked, SIGTRAP);
recalc_sigpending();
spin_unlock_irqrestore(&current->sighand->siglock, flags);
}
send_sig(SIGTRAP, current, 1);
current->thread.trap_no = trapno;
current->thread.error_code = error_code;
force_sig(SIGTRAP, current);
return 0;
}

Expand Down

0 comments on commit 08fddf5

Please sign in to comment.