mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for Matt Fleming <matt@console-pimps.org>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	rostedt@goodmis.org, matt@console-pimps.org, tglx@linutronix.de
Subject: [tip:tracing/urgent] ftrace: Fix the conditional that updates $ref_func
Date: Tue, 4 Aug 2009 08:10:27 GMT	[thread overview]
Message-ID: <tip-fc4c73554c9d93b3e495f2f7acae1323b0d5db84@git.kernel.org> (raw)
In-Reply-To: <1248365775-25196-1-git-send-email-matt@console-pimps.org>

Commit-ID:  fc4c73554c9d93b3e495f2f7acae1323b0d5db84
Gitweb:     http://git.kernel.org/tip/fc4c73554c9d93b3e495f2f7acae1323b0d5db84
Author:     Matt Fleming <matt@console-pimps.org>
AuthorDate: Thu, 23 Jul 2009 17:16:14 +0100
Committer:  Steven Rostedt <rostedt@goodmis.org>
CommitDate: Thu, 23 Jul 2009 12:20:08 -0400

ftrace: Fix the conditional that updates $ref_func

Fix the conditional that checks if we already have a $ref_func and that
the new function is weak. The code as previously checking whether either
condition was false, and we really need to only update $ref_func is both
cconditions are false.

Signed-off-by: Matt Fleming <matt@console-pimps.org>
LKML-Reference: <1248365775-25196-1-git-send-email-matt@console-pimps.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>


---
 scripts/recordmcount.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 7109e2b..16c5563 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -414,7 +414,7 @@ while (<IN>) {
 	    $read_function = 0;
 	} else {
 	    # if we already have a function, and this is weak, skip it
-	    if (!defined($ref_func) || !defined($weak{$text})) {
+	    if (!defined($ref_func) && !defined($weak{$text})) {
 		$ref_func = $text;
 	    }
 	}

      parent reply	other threads:[~2009-08-04  8:10 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-23  9:51 [PATCH -tip] ftrace: Correctly calculate the first function in the .text section Matt Fleming
2009-07-23 14:50 ` Steven Rostedt
2009-07-23 14:52   ` Steven Rostedt
2009-07-27 22:29     ` Paul Mundt
2009-07-27 23:45       ` Steven Rostedt
2009-08-02  8:16         ` Paul Mundt
2009-08-04  8:07           ` Ingo Molnar
2009-08-04  8:08             ` Paul Mundt
2009-07-23 16:16   ` [PATCH 1/2] ftrace: Fix the conditional that updates $ref_func Matt Fleming
2009-07-23 16:16     ` [PATCH 2/2] ftrace: Only update $offset when we update $ref_func Matt Fleming
2009-08-04  8:10       ` [tip:tracing/urgent] " tip-bot for Matt Fleming
2009-08-04  8:10     ` tip-bot for Matt Fleming [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-fc4c73554c9d93b3e495f2f7acae1323b0d5db84@git.kernel.org \
    --to=matt@console-pimps.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®