x86 pci-dma_64.c: cleanups

PATCH New Adrian Bunk 1 participant 1 message Nov 9, 2007 x86

Share & tools

Adrian Bunk

author

2007-11-09 06:06 UTC #0 lore raw

PATCH 1/1 x86 pci-dma_64.c: cleanups

This patch contains the following cleanups:
- make the needlessly global iommu_setup() static
- remove the unused EXPORT_SYMBOL(iommu_merge)

Signed-off-by Adrian Bunk <[email protected]>

---

 arch/x86/kernel/pci-dma_64.c |    3 +--
 include/asm-x86/pci_64.h     |    1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

90fe7f396f3428a83dd5301f3d9622e32fb3bac5

arch/x86/kernel/pci-dma_64.c +1 -2

index aa805b1..516f85f 100644
@@ -13,7 +13,6 @@
 #include <asm/calgary.h>
 
 int iommu_merge __read_mostly = 1;
-EXPORT_SYMBOL(iommu_merge);
 
 dma_addr_t bad_dma_address __read_mostly;
 EXPORT_SYMBOL(bad_dma_address);

@@ -230,7 +229,7 @@ EXPORT_SYMBOL(dma_set_mask);
  * See <Documentation/x86_64/boot-options.txt> for the iommu kernel parameter
  * documentation.
  */
-__init int iommu_setup(char *p)
+static __init int iommu_setup(char *p)
 {
 	iommu_merge = 1;

include/asm-x86/pci_64.h +0 -1

index ef54226..3746903 100644
@@ -26,7 +26,6 @@ extern int (*pci_config_write)(int seg, int bus, int dev, int fn, int reg, int l
 
 
 extern void pci_iommu_alloc(void);
-extern int iommu_setup(char *opt);
 
 /* The PCI address space does equal the physical memory
  * address space.  The networking and block device layers use