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

Commit f2430bd1 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

x86/amd-iommu: Remove some merge helper code 



This patch removes some left-overs which where put into the code to
simplify merging code which also depends on changes in other trees.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent 37d0892c

arch/x86/kernel/amd_iommu.c

+0 −6
Original line number Diff line number Diff line
@@ -41,9 +41,7 @@ static DEFINE_RWLOCK(amd_iommu_devtable_lock); 
static LIST_HEAD(iommu_pd_list);

static DEFINE_SPINLOCK(iommu_pd_list_lock);



#ifdef CONFIG_IOMMU_API

static struct iommu_ops amd_iommu_ops;

#endif



/*

 * general struct to manage commands send to an IOMMU
@@ -62,10 +60,6 @@ static void dma_ops_reserve_addresses(struct dma_ops_domain *dom, 
				      unsigned long start_page,

				      unsigned int pages);



#ifndef BUS_NOTIFY_UNBOUND_DRIVER

#define BUS_NOTIFY_UNBOUND_DRIVER 0x0005

#endif



#ifdef CONFIG_AMD_IOMMU_STATS



/*