diff options
| author | David Smith <dsmith@redhat.com> | 2009-06-11 16:29:13 -0500 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2009-06-11 16:29:13 -0500 |
| commit | 5dce84d4fe74644ef76004ff0402510b289a2778 (patch) | |
| tree | 613deb4149bdfee88f48cc28d7a4b124946e5777 /runtime/transport | |
| parent | 43229357282fd51eb1a3c7742932068873c27270 (diff) | |
| parent | 749269040630f0f250f431a258e7967f54dc9a5c (diff) | |
| download | systemtap-steved-5dce84d4fe74644ef76004ff0402510b289a2778.tar.gz systemtap-steved-5dce84d4fe74644ef76004ff0402510b289a2778.tar.xz systemtap-steved-5dce84d4fe74644ef76004ff0402510b289a2778.zip | |
Merge commit 'origin/master' into pr7043
Diffstat (limited to 'runtime/transport')
| -rw-r--r-- | runtime/transport/symbols.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/runtime/transport/symbols.c b/runtime/transport/symbols.c index a329effe..3e6a2fb1 100644 --- a/runtime/transport/symbols.c +++ b/runtime/transport/symbols.c @@ -30,6 +30,14 @@ static void _stp_do_relocation(const char __user *buf, size_t count) dbug_sym(2, "relocate (%s %s 0x%lx)\n", msg.module, msg.reloc, (unsigned long) msg.address); + /* Detect actual kernel load address. */ + if (!strcmp ("kernel", msg.module) + && !strcmp ("_stext", msg.reloc)) { + dbug_sym(2, "found kernel _stext load address: 0x%lx\n", + (unsigned long) msg.address); + if (_stp_kretprobe_trampoline != (unsigned long) -1) + _stp_kretprobe_trampoline += (unsigned long) msg.address; + } /* Save the relocation value. XXX: While keeping the data here is fine for the kernel address space ("kernel" and "*.ko" modules), |