2008-12-28 07:13:07

by Sergio Luis

Subject: [PATCH -tip] x86: mark get_cpu_leaves() with __cpuinit annotation

Resending, now including LKML as well. Sorry.
Sergio.

----

x86: mark get_cpu_leaves() with __cpuinit annotation

Impact: fix section mismatch

Commit b2bb85549134c005e997e5a7ed303bda6a1ae738 introduced
get_cpu_leaves(), which references __cpuinit cpuid4_cache_lookup().
Mark get_cpu_leaves() with a __cpuinit annotation.

Signed-off-by: Sergio Luis <[email protected]>
Cc: Mike Travis <[email protected]>
Cc: Rusty Russell <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Oleg Nesterov <[email protected]>
---
arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 1d76dd9..96f3945 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -536,7 +536,7 @@ static void __cpuinit free_cache_attributes(unsigned int cpu)
per_cpu(cpuid4_info, cpu) = NULL;
}

-static void get_cpu_leaves(void *_retval)
+static void __cpuinit get_cpu_leaves(void *_retval)
{
int j, *retval = _retval, cpu = smp_processor_id();

2008-12-29 12:12:18

by Ingo Molnar

Subject: Re: [PATCH -tip] x86: mark get_cpu_leaves() with __cpuinit annotation

* Sergio Luis <[email protected]> wrote:

> Resending, now including LKML as well. Sorry.
> Sergio.
>
> ----
>
> x86: mark get_cpu_leaves() with __cpuinit annotation
>
> Impact: fix section mismatch
>
> Commit b2bb85549134c005e997e5a7ed303bda6a1ae738 introduced
> get_cpu_leaves(), which references __cpuinit cpuid4_cache_lookup().
> Mark get_cpu_leaves() with a __cpuinit annotation.
>
> Signed-off-by: Sergio Luis <[email protected]>
> Cc: Mike Travis <[email protected]>
> Cc: Rusty Russell <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: Oleg Nesterov <[email protected]>
> ---
> arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

applied to tip/cpus4096, thanks Sergio!

ngo