lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'iommu/fixes-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu

Browse Source
This commit is contained in:
Ingo Molnar
2009-03-05 12:47:34 +01:00
parent 7df4edb07c ff2c8a4167
commit 0bd5c4f7c8
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/amd_iommu.c
View File

@@ -24,9 +24,7 @@
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/iommu-helper.h> #include <linux/iommu-helper.h>
#ifdef CONFIG_IOMMU_API
#include <linux/iommu.h> #include <linux/iommu.h>
#endif
#include <asm/proto.h> #include <asm/proto.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/gart.h> #include <asm/gart.h>

2
drivers/base/iommu.c
View File

@@ -31,7 +31,7 @@ void register_iommu(struct iommu_ops *ops)
iommu_ops = ops; iommu_ops = ops;
} }
bool iommu_found() bool iommu_found(void)
{ {
return iommu_ops != NULL; return iommu_ops != NULL;
} }