diff options
author | Jaak Ristioja <jaak@ristioja.ee> | 2018-02-09 04:22:16 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2018-03-27 03:51:23 -0400 |
commit | 1897a9691e384f6e30b8e8e30fc75d00e402e0ca (patch) | |
tree | 3f9da4c9657758cb6b8e20c5d5c7c80a55d96e24 | |
parent | 13cf912b2da3d79377d8335492077b7225ce67f9 (diff) |
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-INDEX | 4 | ||||
-rw-r--r-- | arch/x86/Kconfig | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/microcode/amd.c | 2 |
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 @@ | |||
2 | - this file | 2 | - this file |
3 | boot.txt | 3 | boot.txt |
4 | - List of boot protocol versions | 4 | - List of boot protocol versions |
5 | early-microcode.txt | ||
6 | - How to load microcode from an initrd-CPIO archive early to fix CPU issues. | ||
7 | earlyprintk.txt | 5 | earlyprintk.txt |
8 | - Using earlyprintk with a USB2 debug port key. | 6 | - Using earlyprintk with a USB2 debug port key. |
9 | entry_64.txt | 7 | entry_64.txt |
10 | - Describe (some of the) kernel entry points for x86. | 8 | - Describe (some of the) kernel entry points for x86. |
11 | exception-tables.txt | 9 | exception-tables.txt |
12 | - why and how Linux kernel uses exception tables on x86 | 10 | - why and how Linux kernel uses exception tables on x86 |
11 | microcode.txt | ||
12 | - How to load microcode from an initrd-CPIO archive early to fix CPU issues. | ||
13 | mtrr.txt | 13 | mtrr.txt |
14 | - how to use x86 Memory Type Range Registers to increase performance | 14 | - how to use x86 Memory Type Range Registers to increase performance |
15 | pat.txt | 15 | 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 | |||
1306 | the Linux kernel. | 1306 | the Linux kernel. |
1307 | 1307 | ||
1308 | The preferred method to load microcode from a detached initrd is described | 1308 | The preferred method to load microcode from a detached initrd is described |
1309 | in Documentation/x86/early-microcode.txt. For that you need to enable | 1309 | in Documentation/x86/microcode.txt. For that you need to enable |
1310 | CONFIG_BLK_DEV_INITRD in order for the loader to be able to scan the | 1310 | CONFIG_BLK_DEV_INITRD in order for the loader to be able to scan the |
1311 | initrd for microcode blobs. | 1311 | initrd for microcode blobs. |
1312 | 1312 | ||
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]; | |||
58 | 58 | ||
59 | /* | 59 | /* |
60 | * Microcode patch container file is prepended to the initrd in cpio | 60 | * Microcode patch container file is prepended to the initrd in cpio |
61 | * format. See Documentation/x86/early-microcode.txt | 61 | * format. See Documentation/x86/microcode.txt |
62 | */ | 62 | */ |
63 | static const char | 63 | static const char |
64 | ucode_path[] __maybe_unused = "kernel/x86/microcode/AuthenticAMD.bin"; | 64 | ucode_path[] __maybe_unused = "kernel/x86/microcode/AuthenticAMD.bin"; |