Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752478AbZKLIWI (ORCPT ); Thu, 12 Nov 2009 03:22:08 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752343AbZKLIWH (ORCPT ); Thu, 12 Nov 2009 03:22:07 -0500 Received: from hera.kernel.org ([140.211.167.34]:58520 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751993AbZKLIWG (ORCPT ); Thu, 12 Nov 2009 03:22:06 -0500 Date: Thu, 12 Nov 2009 08:21:50 GMT From: tip-bot for Roel Kluin Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, rostedt@goodmis.org, roel.kluin@gmail.com, tglx@linutronix.de Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, rostedt@goodmis.org, roel.kluin@gmail.com, tglx@linutronix.de In-Reply-To: <4AFB2C0B.50605@gmail.com> References: <4AFB2C0B.50605@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:tracing/urgent] tracing: Fix return value of tracing_stats_read() Message-ID: Git-Commit-ID: a646365cc330b5aaf4452c91f61b1e0d1acf68d0 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1276 Lines: 37 Commit-ID: a646365cc330b5aaf4452c91f61b1e0d1acf68d0 Gitweb: http://git.kernel.org/tip/a646365cc330b5aaf4452c91f61b1e0d1acf68d0 Author: Roel Kluin AuthorDate: Wed, 11 Nov 2009 22:26:35 +0100 Committer: Steven Rostedt CommitDate: Wed, 11 Nov 2009 21:26:55 -0500 tracing: Fix return value of tracing_stats_read() The function tracing_stats_read() mistakenly returns ENOMEM instead of the negative value -ENOMEM. Signed-off-by: Roel Kluin LKML-Reference: <4AFB2C0B.50605@gmail.com> Signed-off-by: Steven Rostedt --- kernel/trace/trace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index b20d3ec..03c7fd5 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -3730,7 +3730,7 @@ tracing_stats_read(struct file *filp, char __user *ubuf, s = kmalloc(sizeof(*s), GFP_KERNEL); if (!s) - return ENOMEM; + return -ENOMEM; trace_seq_init(s); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/