diff options
| author | hunt <hunt> | 2006-11-15 17:54:13 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2006-11-15 17:54:13 +0000 |
| commit | 07c66d4067739f4b5090143c2fdc97dd0b9ee922 (patch) | |
| tree | a2958f18a383e13810643bb784a5c052353fe7df /runtime/transport/procfs.c | |
| parent | 132c23b4b9134b9e8969fb57484f9fcdad1d46f5 (diff) | |
| download | systemtap-steved-07c66d4067739f4b5090143c2fdc97dd0b9ee922.tar.gz systemtap-steved-07c66d4067739f4b5090143c2fdc97dd0b9ee922.tar.xz systemtap-steved-07c66d4067739f4b5090143c2fdc97dd0b9ee922.zip | |
2006-11-15 Martin Hunt <hunt@redhat.com>
* procfs.c (_stp_proc_write_cmd): For STP_SYMBOLS,
type field is a long to preserve alignment.
Use STP_ALLOC_FLAGS.
* symbols.c: Use STP_ALLOC_FLAGS.
Diffstat (limited to 'runtime/transport/procfs.c')
| -rw-r--r-- | runtime/transport/procfs.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/runtime/transport/procfs.c b/runtime/transport/procfs.c index 77cfa627..794f5c96 100644 --- a/runtime/transport/procfs.c +++ b/runtime/transport/procfs.c @@ -81,8 +81,13 @@ static ssize_t _stp_proc_write_cmd (struct file *file, const char __user *buf, //printk ("_stp_proc_write_cmd. count:%d type:%d\n", count, type); - count -= sizeof(int); - buf += sizeof(int); + if (type == STP_SYMBOLS) { + count -= sizeof(long); + buf += sizeof(long); + } else { + count -= sizeof(int); + buf += sizeof(int); + } switch (type) { case STP_START: @@ -270,7 +275,7 @@ static int _stp_set_buffers(int num) if (num > _stp_current_buffers) { for (i = 0; i < num - _stp_current_buffers; i++) { - p = (struct list_head *)kmalloc(sizeof(struct _stp_buffer),GFP_KERNEL); + p = (struct list_head *)kmalloc(sizeof(struct _stp_buffer),STP_ALLOC_FLAGS); if (!p) { _stp_current_buffers += i; goto err; @@ -309,7 +314,7 @@ static int _stp_register_procfs (void) /* allocate buffers */ for (i = 0; i < STP_DEFAULT_BUFFERS; i++) { - p = (struct list_head *)kmalloc(sizeof(struct _stp_buffer),GFP_KERNEL); + p = (struct list_head *)kmalloc(sizeof(struct _stp_buffer),STP_ALLOC_FLAGS); // printk("allocated buffer at %lx\n", (long)p); if (!p) goto err2; @@ -345,7 +350,7 @@ static int _stp_register_procfs (void) if (de == NULL) goto err1; de->proc_fops = &_stp_proc_fops; - de->data = kmalloc(sizeof(int), GFP_KERNEL); + de->data = kmalloc(sizeof(int), STP_ALLOC_FLAGS); if (de->data == NULL) { remove_proc_entry (buf, _stp_proc_mod); goto err1; |