xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next

Browse Source 
Conflicts:
	drivers/iommu/amd_iommu.c
	drivers/iommu/intel-iommu.c
	include/linux/iommu.h
This commit is contained in:
Joerg Roedel
2012-01-09 13:06:28 +01:00
parent 00fb5430f5 95bdaf71cc
commit f93ea73387
9 changed files with 155 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/include/asm/iommu.h
View File

@@ -11,10 +11,12 @@ extern void no_iommu_init(void);
extern int force_iommu, no_iommu;
extern int iommu_pass_through;
extern int iommu_detected;
extern int iommu_group_mf;
#else
#define iommu_pass_through (0)
#define no_iommu (1)
#define iommu_detected (0)
#define iommu_group_mf (0)
#endif
extern void iommu_dma_init(void);
extern void machvec_init(const char *name);