[tip:x86/microcode] x86/microcode: Bump driver version, update copyrights
From: tip-bot for Borislav Petkov
Date: Tue Oct 25 2016 - 12:34:25 EST
Commit-ID: 14cfbe55c75ada9abd2d9cad97dafb4206c5f9e2
Gitweb: http://git.kernel.org/tip/14cfbe55c75ada9abd2d9cad97dafb4206c5f9e2
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Tue, 25 Oct 2016 11:55:22 +0200
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Tue, 25 Oct 2016 12:28:59 +0200
x86/microcode: Bump driver version, update copyrights
Let's increment that number finally: it is long overdue.
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Cc: Andy Lutomirski <luto@xxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: Brian Gerst <brgerst@xxxxxxxxx>
Cc: Denys Vlasenko <dvlasenk@xxxxxxxxxx>
Cc: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/20161025095522.11964-13-bp@xxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
arch/x86/kernel/cpu/microcode/amd.c | 1 +
arch/x86/kernel/cpu/microcode/core.c | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index 0dd8db1..6f353bd 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -5,6 +5,7 @@
* CPUs and later.
*
* Copyright (C) 2008-2011 Advanced Micro Devices Inc.
+ * 2013-2016 Borislav Petkov <bp@xxxxxxxxx>
*
* Author: Peter Oruba <peter.oruba@xxxxxxx>
*
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index dd3d64f..6996413 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2000-2006 Tigran Aivazian <tigran@xxxxxxxxxxxxxxxxxxxx>
* 2006 Shaohua Li <shaohua.li@xxxxxxxxx>
- * 2013-2015 Borislav Petkov <bp@xxxxxxxxx>
+ * 2013-2016 Borislav Petkov <bp@xxxxxxxxx>
*
* X86 CPU microcode early update for Linux:
*
@@ -41,7 +41,7 @@
#include <asm/cmdline.h>
#include <asm/setup.h>
-#define MICROCODE_VERSION "2.01"
+#define DRIVER_VERSION "2.2"
static struct microcode_ops *microcode_ops;
static bool dis_ucode_ldr;
@@ -703,7 +703,7 @@ int __init microcode_init(void)
cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/microcode:online",
mc_cpu_online, mc_cpu_down_prep);
- pr_info("Microcode Update Driver: v%s.", MICROCODE_VERSION);
+ pr_info("Microcode Update Driver: v%s.", DRIVER_VERSION);
return 0;