summaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung.kim@lge.com>2012-06-11 15:28:53 +0900
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-06-29 13:28:13 -0300
commit50d8f9e393c5a1a8864fda75e3a9f2b800497a61 (patch)
treecd109f00dc5efc5ca91ba13acd2f307e8f841f03 /tools/lib
parente080e6f1c863242ff709046d0486d09c46dc484a (diff)
downloadlinux-stable-50d8f9e393c5a1a8864fda75e3a9f2b800497a61.tar.gz
linux-stable-50d8f9e393c5a1a8864fda75e3a9f2b800497a61.tar.bz2
linux-stable-50d8f9e393c5a1a8864fda75e3a9f2b800497a61.zip
tools lib traceevent: Replace malloc_or_die to plain malloc in alloc_event()
Because the only caller of the alloc_event() (pevent_parse_event) checks return value properly, it can be changed to use plain malloc. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/1339396133-9839-1-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/traceevent/event-parse.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index b1abd39923d6..83f0a8add177 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -616,7 +616,9 @@ static struct event_format *alloc_event(void)
{
struct event_format *event;
- event = malloc_or_die(sizeof(*event));
+ event = malloc(sizeof(*event));
+ if (!event)
+ return NULL;
memset(event, 0, sizeof(*event));
return event;