From 216ff631744ba177807c00e116c6e2b16247cadb Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 30 Jan 2008 13:30:31 +0100 Subject: [PATCH] --- yaml --- r: 79790 b: refs/heads/master c: 3e7593966be6f6d29a15138c0c96b961d437f2f5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/pci-dma_64.c | 3 +-- trunk/include/asm-x86/pci_64.h | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9173bd7877b4..60e3f31a5785 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed65260bb814a5c600a4e883f6bda73e287f5dec +refs/heads/master: 3e7593966be6f6d29a15138c0c96b961d437f2f5 diff --git a/trunk/arch/x86/kernel/pci-dma_64.c b/trunk/arch/x86/kernel/pci-dma_64.c index 5552d23d23c2..a82473d192a3 100644 --- a/trunk/arch/x86/kernel/pci-dma_64.c +++ b/trunk/arch/x86/kernel/pci-dma_64.c @@ -13,7 +13,6 @@ #include int iommu_merge __read_mostly = 0; -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 for the iommu kernel parameter * documentation. */ -__init int iommu_setup(char *p) +static __init int iommu_setup(char *p) { iommu_merge = 1; diff --git a/trunk/include/asm-x86/pci_64.h b/trunk/include/asm-x86/pci_64.h index ef54226a9325..374690314539 100644 --- a/trunk/include/asm-x86/pci_64.h +++ b/trunk/include/asm-x86/pci_64.h @@ -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