lkml.org 
[lkml]   [2009]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: Please revert fc4c73554c9d93b3e495f2f7acae1323b0d5db84. Re: [PATCH 1/2] ftrace: Fix the conditional that updates $ref_func

On Wed, 5 Aug 2009, Dave Airlie wrote:

> On Fri, Jul 24, 2009 at 2:16 AM, Matt Fleming<matt@console-pimps.org> wrote:
> > 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.
> >
>
> This breaks the powerpc build on Fedora.
>
> When building on ppc64 this commit causes the links of drivers/hwmon/lm93.o
> to fail.
>
> It introduces an undefined symbol
> U .LM93_IN_FROM_REG
>
> that isn't produced when this patch is reverted
>
> This was found when the Fedora kernel failed to build when I pulled in
> -rc5-git3.
>
> can be seen at the end of:
> http://koji.fedoraproject.org/koji/getfile?taskID=1582002&name=build.log
>
> So can we revert this (at this stage in -rc5 or maybe fix it).
>

I was not able to reproduce it, but could you see if this patch fixes the
issue?

-- Steve

diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index d29baa2..a6bfecb 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -402,7 +402,6 @@ while (<IN>) {

# section found, now is this a start of a function?
} elsif ($read_function && /$function_regex/) {
- $text_found = 1;
$text = $2;

# if this is either a local function or a weak function
@@ -412,11 +411,13 @@ while (<IN>) {
$ref_func = $text;
$read_function = 0;
$offset = hex $1;
+ $text_found = 1;
} else {
# if we already have a function, and this is weak, skip it
if (!defined($ref_func) && !defined($weak{$text})) {
$ref_func = $text;
$offset = hex $1;
+ $text_found = 1;
}
}
} elsif ($read_headers && /$mcount_section/) {

\
 
 \ /
  Last update: 2009-08-05 21:37    [W:0.036 / U:6.000 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site