summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaak Ristioja <jaak@ristioja.ee>2018-02-09 11:22:16 +0200
committerJiri Kosina <jkosina@suse.cz>2018-03-27 09:51:23 +0200
commit1897a9691e384f6e30b8e8e30fc75d00e402e0ca (patch)
tree3f9da4c9657758cb6b8e20c5d5c7c80a55d96e24
parent13cf912b2da3d79377d8335492077b7225ce67f9 (diff)
downloadlinux-stable-1897a9691e384f6e30b8e8e30fc75d00e402e0ca.tar.gz
linux-stable-1897a9691e384f6e30b8e8e30fc75d00e402e0ca.tar.bz2
linux-stable-1897a9691e384f6e30b8e8e30fc75d00e402e0ca.zip
Documentation: Fix early-microcode.txt references after file rename
The file Documentation/x86/early-microcode.txt was renamed to Documentation/x86/microcode.txt in 0e3258753f81, but it was still referenced by its old name in a three places: * Documentation/x86/00-INDEX * arch/x86/Kconfig * arch/x86/kernel/cpu/microcode/amd.c This commit updates these references accordingly. Fixes: 0e3258753f81 ("x86/microcode: Document the three loading methods") Signed-off-by: Jaak Ristioja <jaak@ristioja.ee> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--Documentation/x86/00-INDEX4
-rw-r--r--arch/x86/Kconfig2
-rw-r--r--arch/x86/kernel/cpu/microcode/amd.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/x86/00-INDEX b/Documentation/x86/00-INDEX
index 692264456f0f..3bb2ee3edcd1 100644
--- a/Documentation/x86/00-INDEX
+++ b/Documentation/x86/00-INDEX
@@ -2,14 +2,14 @@
- this file
boot.txt
- List of boot protocol versions
-early-microcode.txt
- - How to load microcode from an initrd-CPIO archive early to fix CPU issues.
earlyprintk.txt
- Using earlyprintk with a USB2 debug port key.
entry_64.txt
- Describe (some of the) kernel entry points for x86.
exception-tables.txt
- why and how Linux kernel uses exception tables on x86
+microcode.txt
+ - How to load microcode from an initrd-CPIO archive early to fix CPU issues.
mtrr.txt
- how to use x86 Memory Type Range Registers to increase performance
pat.txt
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0fa71a78ec99..45981cc51239 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1306,7 +1306,7 @@ config MICROCODE
the Linux kernel.
The preferred method to load microcode from a detached initrd is described
- in Documentation/x86/early-microcode.txt. For that you need to enable
+ in Documentation/x86/microcode.txt. For that you need to enable
CONFIG_BLK_DEV_INITRD in order for the loader to be able to scan the
initrd for microcode blobs.
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index 48179928ff38..0624957aa068 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -58,7 +58,7 @@ static u8 amd_ucode_patch[PATCH_MAX_SIZE];
/*
* Microcode patch container file is prepended to the initrd in cpio
- * format. See Documentation/x86/early-microcode.txt
+ * format. See Documentation/x86/microcode.txt
*/
static const char
ucode_path[] __maybe_unused = "kernel/x86/microcode/AuthenticAMD.bin";