[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-f9ac5a69edee0ee7e06a05727226e3f275306c8d@git.kernel.org>
Date: Thu, 1 Oct 2009 09:59:41 GMT
From: tip-bot for Paul Mundt <lethal@...ux-sh.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
lizf@...fujitsu.com, penberg@...helsinki.fi,
eduard.munteanu@...ux360.ro, lethal@...ux-sh.org,
fweisbec@...il.com, rostedt@...dmis.org, tglx@...utronix.de,
mingo@...e.hu
Subject: [tip:tracing/urgent] kmemtrace: Fix up tracer registration
Commit-ID: f9ac5a69edee0ee7e06a05727226e3f275306c8d
Gitweb: http://git.kernel.org/tip/f9ac5a69edee0ee7e06a05727226e3f275306c8d
Author: Paul Mundt <lethal@...ux-sh.org>
AuthorDate: Mon, 28 Sep 2009 16:55:40 +0900
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Thu, 1 Oct 2009 11:53:44 +0200
kmemtrace: Fix up tracer registration
Commit ddc1637af217dbd8bc51f30e6d24e84476a869a6 ("kmemtrace: Print
binary output only if 'bin' option is set") ended up inverting the
error detection logic. register_tracer() returns 0 on success,
which this change caused to treat as an error, resulting in:
[ 0.132000] Warning: could not register the kmem tracer
as well as bailing out of the initcall with an error value. This
restores the old logic.
Signed-off-by: Paul Mundt <lethal@...ux-sh.org>
Acked-by: Pekka Enberg <penberg@...helsinki.fi>
Acked-by: Frederic Weisbecker <fweisbec@...il.com>
Cc: Eduard - Gabriel Munteanu <eduard.munteanu@...ux360.ro>
Cc: Steven Rostedt <rostedt@...dmis.org>
Cc: Li Zefan <lizf@...fujitsu.com>
LKML-Reference: <20090928075540.GD6668@...ux-sh.org>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
kernel/trace/kmemtrace.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/trace/kmemtrace.c b/kernel/trace/kmemtrace.c
index 81b1645..a91da69 100644
--- a/kernel/trace/kmemtrace.c
+++ b/kernel/trace/kmemtrace.c
@@ -501,7 +501,7 @@ static int __init init_kmem_tracer(void)
return 1;
}
- if (!register_tracer(&kmem_tracer)) {
+ if (register_tracer(&kmem_tracer) != 0) {
pr_warning("Warning: could not register the kmem tracer\n");
return 1;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists