diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-05-01 13:40:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-05-01 13:40:23 +0200 |
| commit | bfb8c6e495b9fc14c315e0f1550394b2137035b4 (patch) | |
| tree | a9f9468b3bca9c8c606c0ed4fd5bea8eaef19580 /arch | |
| parent | a351e9b9fc24e982ec2f0e76379a49826036da12 (diff) | |
| parent | cf8178f78645148dc38b28263b9d3f604148e3a8 (diff) | |
| download | linux-stable-bfb8c6e495b9fc14c315e0f1550394b2137035b4.tar.gz linux-stable-bfb8c6e495b9fc14c315e0f1550394b2137035b4.tar.bz2 linux-stable-bfb8c6e495b9fc14c315e0f1550394b2137035b4.zip | |
Merge branch 'x86/microcode' into x86/urgent, to pick up cleanup
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/amd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index 7889ae492af0..1d38e53c2d5c 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -352,8 +352,6 @@ void reload_ucode_amd(void) u32 rev, dummy; mc = (struct microcode_amd *)amd_ucode_patch; - if (!mc) - return; rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy); |