diff options
| author | Borislav Petkov (AMD) <bp@alien8.de> | 2024-12-02 20:00:10 +0100 |
|---|---|---|
| committer | Borislav Petkov (AMD) <bp@alien8.de> | 2024-12-10 18:25:40 +0100 |
| commit | ab0e7f20768af59fe161d71cc5d1de384f2a9da8 (patch) | |
| tree | e0109beff81ecc2b60ae24fae1efd5c1e8b9b29e /arch | |
| parent | x86/ioremap: Remove unused size parameter in remapping functions (diff) | |
| download | linux-ab0e7f20768af59fe161d71cc5d1de384f2a9da8.tar.gz linux-ab0e7f20768af59fe161d71cc5d1de384f2a9da8.zip | |
Documentation: Merge x86-specific boot options doc into kernel-parameters.txt
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@alien8.de>
Reviewed-by: Sohil Mehta <sohil.mehta@intel.com>
Link: https://lore.kernel.org/r/20241202190011.11979-1-bp@kernel.org
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig.debug | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/pci-dma.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index 74777a97e394..1eb4d23cdaae 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug @@ -97,7 +97,7 @@ config IOMMU_DEBUG code. When you use it make sure you have a big enough IOMMU/AGP aperture. Most of the options enabled by this can be set more finegrained using the iommu= command line - options. See Documentation/arch/x86/x86_64/boot-options.rst for more + options. See Documentation/admin-guide/kernel-parameters.txt for more details. config IOMMU_LEAK diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index f323d83e40a7..6267363e0189 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c @@ -108,10 +108,6 @@ void __init pci_iommu_alloc(void) swiotlb_init(x86_swiotlb_enable, x86_swiotlb_flags); } -/* - * See <Documentation/arch/x86/x86_64/boot-options.rst> for the iommu kernel - * parameter documentation. - */ static __init int iommu_setup(char *p) { iommu_merge = 1; |