summaryrefslogtreecommitdiffstats
path: root/runtime/itrace.c
diff options
context:
space:
mode:
authorTim Moore <timoore@redhat.com>2009-12-10 21:36:43 +0100
committerTim Moore <timoore@redhat.com>2009-12-10 21:36:43 +0100
commita6b3c131a27bbf3533d7ce52bb320698edb60f9c (patch)
treee11b9ef96482de802cb4c078296dcb7ee88f13c5 /runtime/itrace.c
parent1b9fad80af5504ef03c2a88504dbc47bea003721 (diff)
parentb25c01a187d636f1bd3c8c414e7dbe3e84c1b266 (diff)
downloadsystemtap-steved-a6b3c131a27bbf3533d7ce52bb320698edb60f9c.tar.gz
systemtap-steved-a6b3c131a27bbf3533d7ce52bb320698edb60f9c.tar.xz
systemtap-steved-a6b3c131a27bbf3533d7ce52bb320698edb60f9c.zip
Merge commit 'origin/master'
Diffstat (limited to 'runtime/itrace.c')
-rw-r--r--runtime/itrace.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/runtime/itrace.c b/runtime/itrace.c
index f2ed86f2..5b2437a4 100644
--- a/runtime/itrace.c
+++ b/runtime/itrace.c
@@ -219,7 +219,12 @@ static struct itrace_info *create_itrace_info(
if (debug)
printk(KERN_INFO "create_itrace_info: tid=%d\n", tsk->pid);
/* initialize ui */
- ui = kzalloc(sizeof(struct itrace_info), GFP_USER);
+ ui = _stp_kzalloc(sizeof(struct itrace_info));
+ if (ui == NULL) {
+ printk(KERN_ERR "%s:%d: Unable to allocate memory\n",
+ __FUNCTION__, __LINE__);
+ return NULL;
+ }
ui->tsk = tsk;
ui->tid = tsk->pid;
ui->step_flag = step_flag;
@@ -329,7 +334,7 @@ void static remove_usr_itrace_info(struct itrace_info *ui)
spin_lock(&itrace_lock);
list_del(&ui->link);
spin_unlock(&itrace_lock);
- kfree(ui);
+ _stp_kfree(ui);
}
void static cleanup_usr_itrace(void)