Skip to contentSkip to conversation

x86: mark get_cpu_leaves() with __cpuinit annotation

PATCH Applied Sergio Luis 2 participants 2 messages Dec 28, 2008 – Dec 29, 2008 1 message not in the archive x86

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Sergio Luis

author
#1 lore raw

PATCH 1/1 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(-)
arch/x86/kernel/cpu/intel_cacheinfo.c +1 -1
index 1d76dd9..96f3945 100644
@@ -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();
Applied
#2 lore raw
Quoted 13 lines · Sergio Luis

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.

Quoted 8 lines
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