---

yaml --- r: 377287 b: refs/heads/master c: 9497859 h: refs/heads/master i: 377285: 6b1e4d8 377283: e8ffa4e 377279: 9469aea v: v3
git-mirror · Jun 19, 2013 · 10c688f · 10c688f
1 parent fad5a37
commit 10c688f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1603990ea626668c78527376d9ec084d634202d
+refs/heads/master: 949785996ec2250fa958fc3a924e5186e9a8fa2c
diff --git a/trunk/arch/x86/include/asm/microcode.h b/trunk/arch/x86/include/asm/microcode.h
@@ -60,11 +60,11 @@ static inline void __exit exit_amd_microcode(void) {}
 #ifdef CONFIG_MICROCODE_EARLY
 #define MAX_UCODE_COUNT 128
 extern void __init load_ucode_bsp(void);
-extern __init void load_ucode_ap(void);
+extern void __cpuinit load_ucode_ap(void);
 extern int __init save_microcode_in_initrd(void);
 #else
 static inline void __init load_ucode_bsp(void) {}
-static inline __init void load_ucode_ap(void) {}
+static inline void __cpuinit load_ucode_ap(void) {}
 static inline int __init save_microcode_in_initrd(void)
 {
 	return 0;