Messages in this thread | | | Date | Fri, 28 May 2010 14:09:08 -0700 | From | Andrew Morton <> | Subject | Re: [PATCH] powernow-k8: Fix section mismatch |
| |
On Tue, 25 May 2010 17:28:58 +0200 Borislav Petkov <borislav.petkov@amd.com> wrote:
> Fix the following warning: > > "WARNING: arch/x86/kernel/built-in.o(.exit.text+0x72): > Section mismatch in reference from the function powernowk8_exit() to the variable .cpuinit.data:cpb_nb > > The function __exit powernowk8_exit() references a variable > __cpuinitdata cpb_nb. This is often seen when error handling in the exit > function uses functionality in the init path. The fix is often to remove > the __cpuinitdata annotation of cpb_nb so it may be used outside an init > section." > > Cc: <stable@kernel.org> > Reported-by: H. Peter Anvin <hpa@zytor.com> > Signed-off-by: Borislav Petkov <borislav.petkov@amd.com> > --- > arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c > index 6f3dc8f..7ec2123 100644 > --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c > +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c > @@ -1497,8 +1497,8 @@ static struct cpufreq_driver cpufreq_amd64_driver = { > * simply keep the boost-disable flag in sync with the current global > * state. > */ > -static int __cpuinit cpb_notify(struct notifier_block *nb, unsigned long action, > - void *hcpu) > +static int cpb_notify(struct notifier_block *nb, unsigned long action, > + void *hcpu) > { > unsigned cpu = (long)hcpu; > u32 lo, hi; > @@ -1528,7 +1528,7 @@ static int __cpuinit cpb_notify(struct notifier_block *nb, unsigned long action, > return NOTIFY_OK; > } > > -static struct notifier_block __cpuinitdata cpb_nb = { > +static struct notifier_block cpb_nb = { > .notifier_call = cpb_notify, > };
I _think_ this is notabug. If CONFIG_HOTPLUG_CPU=y, this code/data doesn't get discarded. If CONFIG_HOTPLUG_CPU=n, [un]register_cpu_notifier() is a no-op.
But apparently the build system _did_ detect such a reference, so what's going on? Maybe I'm confused again.
This code needs work. It should use hotcpu_notifier() rather than diving down into the lower-level register_cpu_notifier(). If this is done then linker magic will cause all the hotplug-specific code to be omitted from vmlinux if CONFIG_HOTPLUG_CPU=n, and I suppose it will fix the above warning.
| |