diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-05 14:22:14 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-05 14:22:14 +1000 |
commit | 76d32a87adac2aaaaf5a4134f225ede4f37f7678 (patch) | |
tree | 15d743f8da99c38f52190e11e1788c90f49385ae /arch/x86/include/asm/microcode_intel.h | |
parent | 92221d1fc707b50772262839aef545c1f5fbc94e (diff) | |
parent | 1247de2692e051a667238787385a65e8ea9bbaee (diff) |
Merge branch 'cpuinit/master'
Diffstat (limited to 'arch/x86/include/asm/microcode_intel.h')
-rw-r--r-- | arch/x86/include/asm/microcode_intel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/microcode_intel.h b/arch/x86/include/asm/microcode_intel.h index 87a085333cbf..9067166409bf 100644 --- a/arch/x86/include/asm/microcode_intel.h +++ b/arch/x86/include/asm/microcode_intel.h @@ -65,12 +65,12 @@ update_match_revision(struct microcode_header_intel *mc_header, int rev); #ifdef CONFIG_MICROCODE_INTEL_EARLY extern void __init load_ucode_intel_bsp(void); -extern void __cpuinit load_ucode_intel_ap(void); +extern void load_ucode_intel_ap(void); extern void show_ucode_info_early(void); extern int __init save_microcode_in_initrd_intel(void); #else static inline __init void load_ucode_intel_bsp(void) {} -static inline __cpuinit void load_ucode_intel_ap(void) {} +static inline void load_ucode_intel_ap(void) {} static inline void show_ucode_info_early(void) {} static inline int __init save_microcode_in_initrd_intel(void) { return -EINVAL; } #endif |