From mboxrd@z Thu Jan  1 00:00:00 1970
From: robert.richter@amd.com (Robert Richter)
Date: Thu, 22 Dec 2011 15:21:40 +0100
Subject: [PATCH] arm: oprofile: fix linkage issue
In-Reply-To: <1324561016-19389-1-git-send-email-vladimir.zapolskiy@nokia.com>
References: <1324561016-19389-1-git-send-email-vladimir.zapolskiy@nokia.com>
Message-ID: <20111222142140.GP16765@erda.amd.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On 22.12.11 15:36:56, Vladimir Zapolskiy wrote:
> This change fixes a linking problem, which happens if oprofile is selected to
> be compiled as built-in:
> 
>   `oprofile_arch_exit' referenced in section `.init.text' of
>   arch/arm/oprofile/built-in.o: defined in discarded section
>   `.exit.text' of arch/arm/oprofile/built-in.o
> 
> The problem is appeared after commit 87121ca504, which introduced
> oprofile_arch_exit() calls from __init function. Note that the aforementioned
> commit has been backported to stable branches, and the problem is known to be
> reproduced at least with 3.0.13 and 3.1.5 kernels.

I will fix it upstream, afterwards this goes into stable due to the
stable tag.

Right, commit 87121ca504 went into stable kernels 3.0 and 3.1, need to
fix them too:

CC: stable at kernel.org # 3.0+

Please fix also arch/sh with this patch:

 $ git grep exit.*oprofile_arch_exit arch/*/oprofile drivers/oprofile/ 
 arch/arm/oprofile/common.c:void __exit oprofile_arch_exit(void)
 arch/sh/oprofile/common.c:void __exit oprofile_arch_exit(void)
 arch/sh/oprofile/common.c:void __exit oprofile_arch_exit(void) {}

Thanks,

-Robert

> 
> Signed-off-by: Vladimir Zapolskiy <vladimir.zapolskiy@nokia.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Robert Richter <robert.richter@amd.com>
> Cc: stable at kernel.org
> ---
>  arch/arm/oprofile/common.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
> index c074e66..4e0a371 100644
> --- a/arch/arm/oprofile/common.c
> +++ b/arch/arm/oprofile/common.c
> @@ -116,7 +116,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
>  	return oprofile_perf_init(ops);
>  }
>  
> -void __exit oprofile_arch_exit(void)
> +void oprofile_arch_exit(void)
>  {
>  	oprofile_perf_exit();
>  }
> -- 
> 1.7.2.3
> 
> 

-- 
Advanced Micro Devices, Inc.
Operating System Research Center