git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebieder...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
uprobes.c
diff --git
a/arch/x86/kernel/uprobes.c
b/arch/x86/kernel/uprobes.c
index 918b5092a85f7b2a5dd67b8202a31ac1de1e9bb7..d8359ebeea70c26bb7f621a3f8fea1ffb3fbb421 100644
(file)
--- a/
arch/x86/kernel/uprobes.c
+++ b/
arch/x86/kernel/uprobes.c
@@
-1074,7
+1074,7
@@
arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
pr_err("return address clobbered: pid=%d, %%sp=%#lx, %%ip=%#lx\n",
current->pid, regs->sp, regs->ip);
- force_sig(SIGSEGV
, current
);
+ force_sig(SIGSEGV);
}
return -1;