commit 5f0f1c166647860bb2c2a206338e7d9af3834753

Author: Magnus Damm <magnus@valinux.co.jp>
Date:   Tue Sep 26 10:52:36 2006 +0200

    [PATCH] i386: mark cpu identify functions as __cpuinit

    Mark i386-specific cpu identification functions as __cpuinit. They are all
    only called from arch/i386/common.c:identify_cpu() that already is marked as
    __cpuinit.

    Signed-off-by: Magnus Damm <magnus@valinux.co.jp>
    Signed-off-by: Andi Kleen <ak@suse.de>

diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c
index f03b7f94c304af1cc742745d439fb4b72eae1e6e..a5725cdffdedb25c3e0933ab1d8d239b6eb30977 100644 (file)
--- a/arch/i386/kernel/cpu/cyrix.c
+++ b/arch/i386/kernel/cpu/cyrix.c
@@ -12,7 +12,7 @@
 /*
  * Read NSC/Cyrix DEVID registers (DIR) to get more detailed info. about the CPU
  */
-static void __init do_cyrix_devid(unsigned char *dir0, unsigned char *dir1)
+static void __cpuinit do_cyrix_devid(unsigned char *dir0, unsigned char *dir1)
 {
        unsigned char ccr2, ccr3;
        unsigned long flags;
@@ -394,7 +394,7 @@ static inline int test_cyrix_52div(void)
        return (unsigned char) (test >> 8) == 0x02;
 }
 
-static void cyrix_identify(struct cpuinfo_x86 * c)
+static void __cpuinit cyrix_identify(struct cpuinfo_x86 * c)
 {
        /* Detect Cyrix with disabled CPUID */
        if ( c->x86 == 4 && test_cyrix_52div() ) {

diff --git a/arch/i386/kernel/cpu/nexgen.c b/arch/i386/kernel/cpu/nexgen.c
index ad87fa58058d574c7eaa431b2497f82ff60156a8..6857038b620261c34edd05936fe11b772ec0ce50 100644 (file)
--- a/arch/i386/kernel/cpu/nexgen.c
+++ b/arch/i386/kernel/cpu/nexgen.c
@@ -10,7 +10,7 @@
  *     to have CPUID. (Thanks to Herbert Oppmann)
  */
  
-static int __init deep_magic_nexgen_probe(void)
+static int __cpuinit deep_magic_nexgen_probe(void)
 {
        int ret;
        
@@ -32,7 +32,7 @@ static void __init init_nexgen(struct cpuinfo_x86 * c)
        c->x86_cache_size = 256; /* A few had 1 MB... */
 }
 
-static void __init nexgen_identify(struct cpuinfo_x86 * c)
+static void __cpuinit nexgen_identify(struct cpuinfo_x86 * c)
 {
        /* Detect NexGen with old hypercode */
        if ( deep_magic_nexgen_probe() ) {

diff --git a/arch/i386/kernel/cpu/transmeta.c b/arch/i386/kernel/cpu/transmeta.c
index 7214c9b577ab91329ecdb261926e2cdde6e729fd..e81f9711efab4b611680c128f893de22552b8864 100644 (file)
--- a/arch/i386/kernel/cpu/transmeta.c
+++ b/arch/i386/kernel/cpu/transmeta.c
@@ -85,7 +85,7 @@ static void __init init_transmeta(struct cpuinfo_x86 *c)
 #endif
 }
 
-static void __init transmeta_identify(struct cpuinfo_x86 * c)
+static void __cpuinit transmeta_identify(struct cpuinfo_x86 * c)
 {
        u32 xlvl;
        generic_identify(c);