Please revert fc4c73554c9d93b3e495f2f7acae1323b0d5db84. Re: [PATCH 1/2] ftrace: Fix the conditional that updates $ref_func

[Dave Airlie <airlied@gmail.com>]

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).

Dave.

> Signed-off-by: Matt Fleming <matt@console-pimps.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;
>            }
>        }
> --
> 1.6.4.rc0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>