2009-09-28 07:56:16

by Paul Mundt

Subject: [PATCH] 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 <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Pekka Enberg <[email protected]>
Cc: Eduard - Gabriel Munteanu <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>

---

kernel/trace/kmemtrace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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;
}

2009-09-28 08:37:51

by Pekka Enberg

Subject: Re: [PATCH] kmemtrace: Fix up tracer registration.

On Mon, Sep 28, 2009 at 10:55 AM, Paul Mundt <[email protected]> wrote:
> 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 <[email protected]>

Looks good to me. Thanks Paul!

Acked-by: Pekka Enberg <[email protected]>

2009-09-28 09:08:48

by Frederic Weisbecker

Subject: Re: [PATCH] kmemtrace: Fix up tracer registration.

On Mon, Sep 28, 2009 at 04:55:40PM +0900, Paul Mundt wrote:
> 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 <[email protected]>
> Cc: Li Zefan <[email protected]>
> Cc: Pekka Enberg <[email protected]>
> Cc: Eduard - Gabriel Munteanu <[email protected]>
> Cc: Steven Rostedt <[email protected]>

Acked-by: Frederic Weisbecker <[email protected]>

Thanks!

2009-10-01 10:00:44

by Paul Mundt

Subject: [tip:tracing/urgent] kmemtrace: Fix up tracer registration

Commit-ID: f9ac5a69edee0ee7e06a05727226e3f275306c8d
Gitweb: http://git.kernel.org/tip/f9ac5a69edee0ee7e06a05727226e3f275306c8d
Author: Paul Mundt <[email protected]>
AuthorDate: Mon, 28 Sep 2009 16:55:40 +0900
Committer: Ingo Molnar <[email protected]>
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 <[email protected]>
Acked-by: Pekka Enberg <[email protected]>
Acked-by: Frederic Weisbecker <[email protected]>
Cc: Eduard - Gabriel Munteanu <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Li Zefan <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>


---
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;
}