Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 211525
b: refs/heads/master
c: 388d148
h: refs/heads/master
i:
  211523: 5528010
v: v3
  • Loading branch information
Kyle McMartin authored and Linus Torvalds committed Oct 16, 2010
1 parent 8c78ca8 commit a4953a4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: 99d6734f3ca66c17b81df85724953a9b29eff7cf
refs/heads/master: 388d148fe89cbdd99ec6bcab6cf34480e74c50ee
2 changes: 1 addition & 1 deletion trunk/arch/m32r/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
static int prev_insn(struct pt_regs *regs)
{
u16 inst;
if (get_user(&inst, (u16 __user *)(regs->bpc - 2)))
if (get_user(inst, (u16 __user *)(regs->bpc - 2)))
return -EFAULT;
if ((inst & 0xfff0) == 0x10f0) /* trap ? */
regs->bpc -= 2;
Expand Down

0 comments on commit a4953a4

Please sign in to comment.