core/iommu fixes
Subsystems (2)
Linus,
Please pull the latest core-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus
Thanks,
Ingo
------------------>
Ingo Molnar (1):
intel-iommu: fix build error with INTR_REMAP=y and DMAR=n
Jesper Juhl (1):
swiotlb: Don't include linux/swiotlb.h twice in lib/swiotlb.c
Roland Dreier (1):
swiotlb: add missing __init annotations
arch/x86/kernel/pci-swiotlb_64.c | 2 +- include/linux/dma_remapping.h | 8 ++++++++ lib/swiotlb.c | 3 +-- 3 files changed, 10 insertions(+), 3 deletions(-)
arch/x86/kernel/pci-swiotlb_64.c +1 -1
@@ -13,7 +13,7 @@int swiotlb__read_mostly ; -void *swiotlb_alloc_boot (size_t size,unsigned long nslabs) +void *__init swiotlb_alloc_boot (size_t size,unsigned long nslabs) {return alloc_bootmem_low_pages (size); }
include/linux/dma_remapping.h +8 -0
@@ -17,7 +17,15 @@ struct dmar_domain;struct root_entry ;extern void free_dmar_iommu (struct intel_iommu *iommu); + +#ifdef CONFIG_DMAR extern int iommu_calculate_agaw (struct intel_iommu *iommu); +#else +static inline int iommu_calculate_agaw (struct intel_iommu *iommu) +{ +return 0 ; +} +#endif extern int dmar_disabled;
lib/swiotlb.c +1 -2
@@ -23,7 +23,6 @@#include <linux/spinlock.h> #include <linux/swiotlb.h> #include <linux/string.h> -#include <linux/swiotlb.h> #include <linux/types.h> #include <linux/ctype.h> #include <linux/highmem.h>
@@ -116,7 +115,7 @@ setup_io_tlb_npages(char *str)__setup ("swiotlb=" , setup_io_tlb_npages);/* make io_tlb_overflow tunable too? */ -void *__weak swiotlb_alloc_boot (size_t size,unsigned long nslabs) +void *__weak __init swiotlb_alloc_boot (size_t size,unsigned long nslabs) {return alloc_bootmem_low_pages (size); }