Skip to contentSkip to conversation

i386: intel_cacheinfo.c:find_num_cache_leaves() should be __cpuinit

PATCH New Adrian Bunk 1 participant 1 message Jul 10, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i386: intel_cacheinfo.c:find_num_cache_leaves() should be __cpuinit

This patch fixes the following section mismatch:

<-- snip -->

...
MODPOST vmlinux
WARNING: arch/i386/kernel/built-in.o(.text+0xb6a7): Section mismatch: reference to .init.text:find_num_cache_leaves (between 'init_intel_cacheinfo' and 'cache_shared_cpu_map_setup')
...

<-- snip -->

It could be __init_refok, but gcc >= 4.0 anyway inlines it into the __cpuinit init_intel_cacheinfo(), and IMHO it's too small for "noinline __init".

---

arch/i386/kernel/cpu/intel_cacheinfo.c renamed from arch/i386/kernel/cpu/intel_cacheinfo.c.old +1 -2
@@ -275,8 +275,7 @@
 	return 0;
 }
 
-/* will only be called once; __init is safe here */
-static int __init find_num_cache_leaves(void)
+static int __cpuinit find_num_cache_leaves(void)
 {
 	unsigned int		eax, ebx, ecx, edx;
 	union _cpuid4_leaf_eax	cache_eax;