From 10c688f1ff6d7a5dec2263600905185edad36f09 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Wed, 19 Jun 2013 11:15:26 -0400
Subject: [PATCH] --- yaml --- r: 377287 b: refs/heads/master c:
 949785996ec2250fa958fc3a924e5186e9a8fa2c h: refs/heads/master i:   377285:
 6b1e4d8978a07f953a128cffe91c76d900add890   377283:
 e8ffa4e737c08c9acbca629332eb5c63162d7813   377279:
 9469aeaf067de60b422a32af5a3902e69497aead v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/include/asm/microcode.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3ea796419fbe..bef2f8aad611 100644
--- 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
index 6825e2efd1b4..6bc3985ee473 100644
--- 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;