commit 61d488da9bad8d1511d18291006bd2dd728f173d

Author: Adrian Bunk <bunk@stusta.de>
Date:   Sat Jul 21 04:37:39 2007 -0700

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

    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')

    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".

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Cc: Andi Kleen <ak@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/i386/kernel/cpu/intel_cacheinfo.c b/arch/i386/kernel/cpu/intel_cacheinfo.c
index 5c43be47587f5d4b9875e4c45070027cdb829d95..313ed8812b5c8a9223c44dea5e523b37d88aaa10 100644 (file)
--- a/arch/i386/kernel/cpu/intel_cacheinfo.c
+++ b/arch/i386/kernel/cpu/intel_cacheinfo.c
@@ -239,8 +239,7 @@ static int __cpuinit cpuid4_cache_lookup(int index, struct _cpuid4_info *this_le
        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;