diff options
| author | David Vrabel <david.vrabel@csr.com> | 2010-02-25 08:35:22 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2010-02-25 08:35:22 -0500 |
| commit | 03806fa20f6a081493a731a4b18ea66317f9f947 (patch) | |
| tree | 630796c65c501e3612253ee4d4af58082a5f984c /kernel/signal.c | |
| parent | 35fb2a816a06ded2a3ff83d896c34b83c8e1d556 (diff) | |
| parent | baac35c4155a8aa826c70acee6553368ca5243a2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index d09692b40376..934ae5e687b9 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -979,7 +979,8 @@ static void print_fatal_signal(struct pt_regs *regs, int signr) | |||
| 979 | for (i = 0; i < 16; i++) { | 979 | for (i = 0; i < 16; i++) { |
| 980 | unsigned char insn; | 980 | unsigned char insn; |
| 981 | 981 | ||
| 982 | __get_user(insn, (unsigned char *)(regs->ip + i)); | 982 | if (get_user(insn, (unsigned char *)(regs->ip + i))) |
| 983 | break; | ||
| 983 | printk("%02x ", insn); | 984 | printk("%02x ", insn); |
| 984 | } | 985 | } |
| 985 | } | 986 | } |