diff options
| author | William Cohen <wcohen@redhat.com> | 2009-02-05 14:22:34 -0500 |
|---|---|---|
| committer | William Cohen <wcohen@redhat.com> | 2009-02-05 14:22:34 -0500 |
| commit | e222fe9f5bd2337cb306e29d45f3916b18b43e8f (patch) | |
| tree | 5992189edb0caca9ddc7d87d330f8bef698fde92 /runtime | |
| parent | a38429fc30b6358de9b9680c9f4f795ab4852776 (diff) | |
| parent | 482472c332a2a8a9df203bb6fb8f3f6ed87a9cf4 (diff) | |
| download | systemtap-steved-e222fe9f5bd2337cb306e29d45f3916b18b43e8f.tar.gz systemtap-steved-e222fe9f5bd2337cb306e29d45f3916b18b43e8f.tar.xz systemtap-steved-e222fe9f5bd2337cb306e29d45f3916b18b43e8f.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts:
ChangeLog
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/ChangeLog | 5 | ||||
| -rw-r--r-- | runtime/autoconf-vm-area.c | 9 | ||||
| -rw-r--r-- | runtime/transport/ChangeLog | 7 | ||||
| -rw-r--r-- | runtime/transport/transport.c | 9 |
4 files changed, 30 insertions, 0 deletions
diff --git a/runtime/ChangeLog b/runtime/ChangeLog index 1c8f33b4..81a78c4b 100644 --- a/runtime/ChangeLog +++ b/runtime/ChangeLog @@ -1,3 +1,8 @@ +2009-02-05 Frank Ch. Eigler <fche@elastic.org> + + PR 9740/9816? + * autoconf-vm-area.c: New test. + 2009-02-02 Mark Wielaard <mjw@redhat.com> * sdt.h: Add STAP_PROBE7, 8 and 9 variants. diff --git a/runtime/autoconf-vm-area.c b/runtime/autoconf-vm-area.c new file mode 100644 index 00000000..920d103d --- /dev/null +++ b/runtime/autoconf-vm-area.c @@ -0,0 +1,9 @@ +#include <linux/vmalloc.h> +#include <asm/page.h> + +void foo (void) +{ + void *dummy; + dummy = alloc_vm_area (PAGE_SIZE); + free_vm_area (dummy); +} diff --git a/runtime/transport/ChangeLog b/runtime/transport/ChangeLog index e8e2a047..02f9f119 100644 --- a/runtime/transport/ChangeLog +++ b/runtime/transport/ChangeLog @@ -1,3 +1,10 @@ +2009-02-05 Frank Ch. Eigler <fche@elastic.org> + + PR9740/9816? + * transport.c (_stp_handle_start): Run alloc/free_vm_area() dummy + calls as workaround for kernel valloc/vfree bug. Suggested by + Masami Hiramat <mhiramat@redhat.com>. + 2009-01-06 Frank Ch. Eigler <fche@elastic.org> PR9699. diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c index a572ef9c..97fbf860 100644 --- a/runtime/transport/transport.c +++ b/runtime/transport/transport.c @@ -64,6 +64,15 @@ static struct workqueue_struct *_stp_wq; static void _stp_handle_start(struct _stp_msg_start *st) { dbug_trans(1, "stp_handle_start\n"); + +#ifdef STAPCONF_VM_AREA + { /* PR9740: workaround for kernel valloc bug. */ + void *dummy; + dummy = alloc_vm_area (PAGE_SIZE); + free_vm_area (dummy); + } +#endif + _stp_target = st->target; st->res = probe_start(); if (st->res >= 0) |