summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-12-15 08:12:15 +0100
committerIngo Molnar <mingo@elte.hu>2011-12-15 08:12:15 +0100
commit304fb45374918b166233855bcf498b02586afd80 (patch)
tree3f5f09d7ac7c6067ecdb4db70c8c85f9fc832930 /arch/x86/include
parentMerge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentx86, microcode, AMD: Update copyrights (diff)
downloadlinux-304fb45374918b166233855bcf498b02586afd80.tar.xz
linux-304fb45374918b166233855bcf498b02586afd80.zip
Merge branch 'ucode-verify-size' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/microcode
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/microcode.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index 24215072d0e1..4ebe157bf73d 100644
--- a/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@ -48,6 +48,7 @@ static inline struct microcode_ops * __init init_intel_microcode(void)
#ifdef CONFIG_MICROCODE_AMD
extern struct microcode_ops * __init init_amd_microcode(void);
+extern void __exit exit_amd_microcode(void);
static inline void get_ucode_data(void *to, const u8 *from, size_t n)
{
@@ -59,6 +60,7 @@ static inline struct microcode_ops * __init init_amd_microcode(void)
{
return NULL;
}
+static inline void __exit exit_amd_microcode(void) {}
#endif
#endif /* _ASM_X86_MICROCODE_H */