From 61a84dc72e3ba4f71e035e48738c5cfc9dd4df76 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Fri, 10 Oct 2008 10:57:44 +0300 Subject: [PATCH] --- yaml --- r: 140587 b: refs/heads/master c: faa97abe6a3673af268abb661c6b663252a911aa h: refs/heads/master i: 140585: 32c07bddb11ea579ad3902c293a47821082f7ea1 140583: 1a5b4b4cf7f7faadb279dd30cad36483803175be v: v3 --- [refs] | 2 +- trunk/mm/kmemtrace.c | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index f87fb33aa744..fa052b1c2d8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e67624c22321fa40ad3aa89c307c84bd679d9b2 +refs/heads/master: faa97abe6a3673af268abb661c6b663252a911aa diff --git a/trunk/mm/kmemtrace.c b/trunk/mm/kmemtrace.c index 83ad1cc71a92..f7a49c077df2 100644 --- a/trunk/mm/kmemtrace.c +++ b/trunk/mm/kmemtrace.c @@ -307,29 +307,29 @@ early_param("kmemtrace.subbufs", kmemtrace_set_subbufs); void kmemtrace_init(void) { - if (!kmemtrace_enabled) - return; - if (!kmemtrace_n_subbufs) kmemtrace_n_subbufs = KMEMTRACE_DEF_N_SUBBUFS; kmemtrace_chan = relay_open(NULL, NULL, KMEMTRACE_SUBBUF_SIZE, kmemtrace_n_subbufs, &relay_callbacks, NULL); - if (unlikely(!kmemtrace_chan)) { + if (!kmemtrace_chan) { printk(KERN_ERR "kmemtrace: could not open relay channel.\n"); return; } - if (unlikely(kmemtrace_start_probes())) - goto probe_fail; - - printk(KERN_INFO "kmemtrace: early init successful.\n"); - - return; + if (!kmemtrace_enabled) { + printk(KERN_INFO "kmemtrace: disabled. Pass " + "kemtrace.enable=yes as kernel parameter for " + "boot-time tracing."); + return; + } + if (kmemtrace_start_probes()) { + printk(KERN_ERR "kmemtrace: could not register marker probes!\n"); + kmemtrace_cleanup(); + return; + } -probe_fail: - printk(KERN_ERR "kmemtrace: could not register marker probes!\n"); - kmemtrace_cleanup(); + printk(KERN_INFO "kmemtrace: enabled.\n"); }