aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorBorislav Petkov (AMD) <bp@alien8.de>2024-12-02 20:00:10 +0100
committerBorislav Petkov (AMD) <bp@alien8.de>2024-12-10 18:25:40 +0100
commitab0e7f20768af59fe161d71cc5d1de384f2a9da8 (patch)
treee0109beff81ecc2b60ae24fae1efd5c1e8b9b29e /arch/x86/kernel
parentx86/ioremap: Remove unused size parameter in remapping functions (diff)
downloadlinux-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/x86/kernel')
-rw-r--r--arch/x86/kernel/pci-dma.c4
1 files changed, 0 insertions, 4 deletions
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;