summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2019-06-19 10:19:55 -0400
committerChristoph Hellwig <hch@lst.de>2019-09-03 02:36:30 -0400
commit392e879a445008e8e96b872dabaaf5b1eca58729 (patch)
tree4572c16870a540c69ba7f45fc2f9cdc0b734663e
parent158a6d3ce3bcfcd6e6650f80b16efcf64f8b6bf8 (diff)
dma-mapping: fix filename references
After commit cf65a0f6f6ff ("dma-mapping: move all DMA mapping code to kernel/dma") some of the files are referring to outdated information, i.e. old file names of DMA mapping sources. Fix it here. Note, the lines with "Glue code for..." have been removed completely. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
-rw-r--r--Documentation/x86/x86_64/boot-options.rst2
-rw-r--r--arch/ia64/kernel/setup.c2
-rw-r--r--arch/x86/kernel/pci-swiotlb.c1
-rw-r--r--arch/x86/kernel/setup.c2
-rw-r--r--arch/x86/pci/sta2x11-fixup.c4
5 files changed, 4 insertions, 7 deletions
diff --git a/Documentation/x86/x86_64/boot-options.rst b/Documentation/x86/x86_64/boot-options.rst
index 6a4285a3c7a4..2b98efb5ba7f 100644
--- a/Documentation/x86/x86_64/boot-options.rst
+++ b/Documentation/x86/x86_64/boot-options.rst
@@ -230,7 +230,7 @@ IOMMU (input/output memory management unit)
230=========================================== 230===========================================
231Multiple x86-64 PCI-DMA mapping implementations exist, for example: 231Multiple x86-64 PCI-DMA mapping implementations exist, for example:
232 232
233 1. <lib/dma-direct.c>: use no hardware/software IOMMU at all 233 1. <kernel/dma/direct.c>: use no hardware/software IOMMU at all
234 (e.g. because you have < 3 GB memory). 234 (e.g. because you have < 3 GB memory).
235 Kernel boot message: "PCI-DMA: Disabling IOMMU" 235 Kernel boot message: "PCI-DMA: Disabling IOMMU"
236 236
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index c9cfa760cd57..ab8d25d3e358 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -256,7 +256,7 @@ __initcall(register_memory);
256 * This function checks if the reserved crashkernel is allowed on the specific 256 * This function checks if the reserved crashkernel is allowed on the specific
257 * IA64 machine flavour. Machines without an IO TLB use swiotlb and require 257 * IA64 machine flavour. Machines without an IO TLB use swiotlb and require
258 * some memory below 4 GB (i.e. in 32 bit area), see the implementation of 258 * some memory below 4 GB (i.e. in 32 bit area), see the implementation of
259 * lib/swiotlb.c. The hpzx1 architecture has an IO TLB but cannot use that 259 * kernel/dma/swiotlb.c. The hpzx1 architecture has an IO TLB but cannot use that
260 * in kdump case. See the comment in sba_init() in sba_iommu.c. 260 * in kdump case. See the comment in sba_init() in sba_iommu.c.
261 * 261 *
262 * So, the only machvec that really supports loading the kdump kernel 262 * So, the only machvec that really supports loading the kdump kernel
diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
index 5f5302028a9a..c2cfa5e7c152 100644
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
@@ -1,5 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0 1// SPDX-License-Identifier: GPL-2.0
2/* Glue code to lib/swiotlb.c */
3 2
4#include <linux/pci.h> 3#include <linux/pci.h>
5#include <linux/cache.h> 4#include <linux/cache.h>
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index bbe35bf879f5..77ea96b794bd 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -486,7 +486,7 @@ static int __init reserve_crashkernel_low(void)
486 ret = parse_crashkernel_low(boot_command_line, total_low_mem, &low_size, &base); 486 ret = parse_crashkernel_low(boot_command_line, total_low_mem, &low_size, &base);
487 if (ret) { 487 if (ret) {
488 /* 488 /*
489 * two parts from lib/swiotlb.c: 489 * two parts from kernel/dma/swiotlb.c:
490 * -swiotlb size: user-specified with swiotlb= or default. 490 * -swiotlb size: user-specified with swiotlb= or default.
491 * 491 *
492 * -swiotlb overflow buffer: now hardcoded to 32k. We round it 492 * -swiotlb overflow buffer: now hardcoded to 32k. We round it
diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c
index 97bbc12dd6b2..6269a175385d 100644
--- a/arch/x86/pci/sta2x11-fixup.c
+++ b/arch/x86/pci/sta2x11-fixup.c
@@ -1,8 +1,6 @@
1// SPDX-License-Identifier: GPL-2.0-only 1// SPDX-License-Identifier: GPL-2.0-only
2/* 2/*
3 * arch/x86/pci/sta2x11-fixup.c 3 * DMA translation between STA2x11 AMBA memory mapping and the x86 memory mapping
4 * glue code for lib/swiotlb.c and DMA translation between STA2x11
5 * AMBA memory mapping and the X86 memory mapping
6 * 4 *
7 * ST Microelectronics ConneXt (STA2X11/STA2X10) 5 * ST Microelectronics ConneXt (STA2X11/STA2X10)
8 * 6 *