Commit 5f0f1c166647860bb2c2a206338e7d9af3834753

Authored by Magnus Damm
Committed by Andi Kleen
1 parent b4af3f7cf1

[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>

Showing 3 changed files with 5 additions and 5 deletions Side-by-side Diff

arch/i386/kernel/cpu/cyrix.c
... ... @@ -12,7 +12,7 @@
12 12 /*
13 13 * Read NSC/Cyrix DEVID registers (DIR) to get more detailed info. about the CPU
14 14 */
15   -static void __init do_cyrix_devid(unsigned char *dir0, unsigned char *dir1)
  15 +static void __cpuinit do_cyrix_devid(unsigned char *dir0, unsigned char *dir1)
16 16 {
17 17 unsigned char ccr2, ccr3;
18 18 unsigned long flags;
... ... @@ -394,7 +394,7 @@
394 394 return (unsigned char) (test >> 8) == 0x02;
395 395 }
396 396  
397   -static void cyrix_identify(struct cpuinfo_x86 * c)
  397 +static void __cpuinit cyrix_identify(struct cpuinfo_x86 * c)
398 398 {
399 399 /* Detect Cyrix with disabled CPUID */
400 400 if ( c->x86 == 4 && test_cyrix_52div() ) {
arch/i386/kernel/cpu/nexgen.c
... ... @@ -10,7 +10,7 @@
10 10 * to have CPUID. (Thanks to Herbert Oppmann)
11 11 */
12 12  
13   -static int __init deep_magic_nexgen_probe(void)
  13 +static int __cpuinit deep_magic_nexgen_probe(void)
14 14 {
15 15 int ret;
16 16  
... ... @@ -32,7 +32,7 @@
32 32 c->x86_cache_size = 256; /* A few had 1 MB... */
33 33 }
34 34  
35   -static void __init nexgen_identify(struct cpuinfo_x86 * c)
  35 +static void __cpuinit nexgen_identify(struct cpuinfo_x86 * c)
36 36 {
37 37 /* Detect NexGen with old hypercode */
38 38 if ( deep_magic_nexgen_probe() ) {
arch/i386/kernel/cpu/transmeta.c
... ... @@ -85,7 +85,7 @@
85 85 #endif
86 86 }
87 87  
88   -static void __init transmeta_identify(struct cpuinfo_x86 * c)
  88 +static void __cpuinit transmeta_identify(struct cpuinfo_x86 * c)
89 89 {
90 90 u32 xlvl;
91 91