On 11/20/2024 8:30 AM, Borislav Petkov wrote:
> From: "Borislav Petkov (AMD)" <bp@xxxxxxxxx>
>
> Documentation/arch/x86/x86_64/boot-options.rst is causing unnecessary
> confusion by being a second place where one can put x86 boot options.
> Move them into the main one.
>
> Drop removed ones like "acpi=ht", while at it.
>
> Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
> ---
> .../admin-guide/kernel-parameters.rst | 3 -
> .../admin-guide/kernel-parameters.txt | 214 ++++++++++--
> .../arch/x86/x86_64/boot-options.rst | 312 ------------------
> .../arch/x86/x86_64/fake-numa-for-cpusets.rst | 2 +-
> arch/x86/Kconfig.debug | 2 +-
> arch/x86/kernel/pci-dma.c | 4 -
> 6 files changed, 194 insertions(+), 343 deletions(-)
> delete mode 100644 Documentation/arch/x86/x86_64/boot-options.rst
>
Remove it from the index too?
diff --git a/Documentation/arch/x86/x86_64/index.rst
b/Documentation/arch/x86/x86_64/index.rst
index ad15e9bd623f..a0261957a08a 100644
--- a/Documentation/arch/x86/x86_64/index.rst
+++ b/Documentation/arch/x86/x86_64/index.rst
@@ -7,7 +7,6 @@ x86_64 Support
.. toctree::
:maxdepth: 2
- boot-options
uefi
mm
5level-paging
> + triple: Force a triple fault (init)
> +
> + warm: Don't set the cold reboot flag
> +
Whitespace error here: space before tab in indent
