summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/microcode_amd.h
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2014-12-01 13:12:21 +0300
committerThomas Gleixner <tglx@linutronix.de>2014-12-01 13:51:05 +0300
commit2ef84b3bb97f03332f0c1edb4466b1750dcf97b5 (patch)
treead10420bec232c18c734b9100984794844574b15 /arch/x86/include/asm/microcode_amd.h
parent009d0431c3914de64666bec0d350e54fdd59df6a (diff)
downloadlinux-2ef84b3bb97f03332f0c1edb4466b1750dcf97b5.tar.xz
x86, microcode, AMD: Do not use smp_processor_id() in preemtible context
Hand down the cpu number instead, otherwise lockdep screams when doing echo 1 > /sys/devices/system/cpu/microcode/reload. BUG: using smp_processor_id() in preemptible [00000000] code: amd64-microcode/2470 caller is debug_smp_processor_id+0x12/0x20 CPU: 1 PID: 2470 Comm: amd64-microcode Not tainted 3.18.0-rc6+ #26 ... Signed-off-by: Borislav Petkov <bp@suse.de> Link: http://lkml.kernel.org/r/1417428741-4501-1-git-send-email-bp@alien8.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm/microcode_amd.h')
-rw-r--r--arch/x86/include/asm/microcode_amd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/microcode_amd.h b/arch/x86/include/asm/microcode_amd.h
index b7b10b82d3e5..48a48024ebe4 100644
--- a/arch/x86/include/asm/microcode_amd.h
+++ b/arch/x86/include/asm/microcode_amd.h
@@ -59,7 +59,7 @@ static inline u16 find_equiv_id(struct equiv_cpu_entry *equiv_cpu_table,
extern int __apply_microcode_amd(struct microcode_amd *mc_amd);
extern int apply_microcode_amd(int cpu);
-extern enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size);
+extern enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size);
#define PATCH_MAX_SIZE PAGE_SIZE
extern u8 amd_ucode_patch[PATCH_MAX_SIZE];