From 61fc0db02e01deebc058696d106ad62e9dcd51ec Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 17 Mar 2009 01:20:59 -0500 Subject: [PATCH] --- yaml --- r: 140969 b: refs/heads/master c: c269fc8c537d761f36cb98e637ae934d9331a9d5 h: refs/heads/master i: 140967: 652ac8116d0686bf27cebdb34f544403d5951509 v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_events.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e069845e443c..451e88a0d02c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4106133341121aeaad732d4613de06d9033b5ac +refs/heads/master: c269fc8c537d761f36cb98e637ae934d9331a9d5 diff --git a/trunk/kernel/trace/trace_events.c b/trunk/kernel/trace/trace_events.c index 238ea95a4115..c88227b3b9db 100644 --- a/trunk/kernel/trace/trace_events.c +++ b/trunk/kernel/trace/trace_events.c @@ -378,15 +378,15 @@ event_format_read(struct file *filp, char __user *ubuf, size_t cnt, char *buf; int r; + if (*ppos) + return 0; + s = kmalloc(sizeof(*s), GFP_KERNEL); if (!s) return -ENOMEM; trace_seq_init(s); - if (*ppos) - return 0; - /* If any of the first writes fail, so will the show_format. */ trace_seq_printf(s, "name: %s\n", call->name);