From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754596AbZGWVCh (ORCPT ); Thu, 23 Jul 2009 17:02:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753490AbZGWVCY (ORCPT ); Thu, 23 Jul 2009 17:02:24 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.125]:41537 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753567AbZGWVCW (ORCPT ); Thu, 23 Jul 2009 17:02:22 -0400 Message-Id: <20090723210220.680604358@goodmis.org> References: <20090723210047.294710482@goodmis.org> User-Agent: quilt/0.46-1 Date: Thu, 23 Jul 2009 17:00:50 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Thomas Gleixner , Frederic Weisbecker , Matt Fleming Subject: [PATCH 3/4] ftrace: Fix the conditional that updates $ref_func Content-Disposition: inline; filename=0003-ftrace-Fix-the-conditional-that-updates-ref_func.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matt Fleming 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 LKML-Reference: <1248365775-25196-1-git-send-email-matt@console-pimps.org> Signed-off-by: Steven Rostedt --- 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 () { $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; } } -- 1.6.3.3 --