diff options
| author | Vyacheslav Cherkashin <v.cherkashin@samsung.com> | 2013-05-08 19:47:00 +0400 |
|---|---|---|
| committer | Vyacheslav Cherkashin <v.cherkashin@samsung.com> | 2013-05-08 19:47:00 +0400 |
| commit | b0c348b6cedf5c860f9c13d1d832103305fedab6 (patch) | |
| tree | 477f320d0b78780b44f935a2d5c27239bbf2c65e /kprobe | |
| parent | bbf1ec1f802a067ec2e492f0545e8d9d5c7f00e3 (diff) | |
| parent | f80b896266bcc6fae51386206844dc407f3fd939 (diff) | |
| download | swap-modules-b0c348b6cedf5c860f9c13d1d832103305fedab6.tar.gz swap-modules-b0c348b6cedf5c860f9c13d1d832103305fedab6.tar.bz2 swap-modules-b0c348b6cedf5c860f9c13d1d832103305fedab6.zip | |
Merge commit 'c3b2c00db03530f8b928b959e085d5b9f6ce3264' into kernel
Conflicts:
src/modules/kprobe/dbi_uprobes.c
Diffstat (limited to 'kprobe')
| -rw-r--r-- | kprobe/arch/asm-x86/dbi_kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kprobe/arch/asm-x86/dbi_kprobes.c b/kprobe/arch/asm-x86/dbi_kprobes.c index aa2d62e0..9be48b26 100644 --- a/kprobe/arch/asm-x86/dbi_kprobes.c +++ b/kprobe/arch/asm-x86/dbi_kprobes.c @@ -1223,7 +1223,7 @@ void arch_prepare_kretprobe(struct kretprobe *rp, struct pt_regs *regs) { ri->rp = rp; ri->task = current; - ri->sp = ®s->EREG(sp); + ri->sp = regs->EREG(sp); /* Replace the return addr with trampoline addr */ if (rp->kp.tgid){ |