linux-kernel - [tip:tracing/urgent] ftrace: Fix the conditional that updates $ref

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 4 Aug 2009 08:10:27 GMT
From:	tip-bot for Matt Fleming <matt@...sole-pimps.org>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	rostedt@...dmis.org, matt@...sole-pimps.org, tglx@...utronix.de
Subject: [tip:tracing/urgent] ftrace: Fix the conditional that updates $ref_func

Commit-ID:  fc4c73554c9d93b3e495f2f7acae1323b0d5db84
Gitweb:     http://git.kernel.org/tip/fc4c73554c9d93b3e495f2f7acae1323b0d5db84
Author:     Matt Fleming <matt@...sole-pimps.org>
AuthorDate: Thu, 23 Jul 2009 17:16:14 +0100
Committer:  Steven Rostedt <rostedt@...dmis.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@...sole-pimps.org>
LKML-Reference: <1248365775-25196-1-git-send-email-matt@...sole-pimps.org>
Signed-off-by: Steven Rostedt <rostedt@...dmis.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;
 	    }
 	}
--
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/