Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e759396 authored by Adrian Bunk's avatar Adrian Bunk Committed by Ingo Molnar
Browse files

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: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ed65260b

arch/x86/kernel/pci-dma_64.c

+1 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <asm/calgary.h>



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 <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
Original line number Diff line number Diff line
@@ -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