Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 0578c3b4d44c34e499e1fd5916ed6c63635b25cf

Authored by Linus Torvalds
2 parents 7d8a804c59 52942b6b16
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel… 

…/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  swiotlb: Don't include linux/swiotlb.h twice in lib/swiotlb.c
  intel-iommu: fix build error with INTR_REMAP=y and DMAR=n
  swiotlb: add missing __init annotations

Showing 3 changed files Side-by-side Diff

arch/x86/kernel/pci-swiotlb_64.c
Diff comments   View file @ 0578c3b
... ... @@ -13,7 +13,7 @@
13 13  
14 14 int swiotlb __read_mostly;
15 15  
16   -void *swiotlb_alloc_boot(size_t size, unsigned long nslabs)
  16 +void * __init swiotlb_alloc_boot(size_t size, unsigned long nslabs)
17 17 {
18 18 return alloc_bootmem_low_pages(size);
19 19 }
include/linux/dma_remapping.h
Diff comments   View file @ 0578c3b
... ... @@ -17,7 +17,15 @@
17 17 struct root_entry;
18 18  
19 19 extern void free_dmar_iommu(struct intel_iommu *iommu);
  20 +
  21 +#ifdef CONFIG_DMAR
20 22 extern int iommu_calculate_agaw(struct intel_iommu *iommu);
  23 +#else
  24 +static inline int iommu_calculate_agaw(struct intel_iommu *iommu)
  25 +{
  26 + return 0;
  27 +}
  28 +#endif
21 29  
22 30 extern int dmar_disabled;
23 31  
... ... @@ -23,7 +23,6 @@
23 23 #include <linux/spinlock.h>
24 24 #include <linux/swiotlb.h>
25 25 #include <linux/string.h>
26   -#include <linux/swiotlb.h>
27 26 #include <linux/types.h>
28 27 #include <linux/ctype.h>
29 28 #include <linux/highmem.h>
... ... @@ -116,7 +115,7 @@
116 115 __setup("swiotlb=", setup_io_tlb_npages);
117 116 /* make io_tlb_overflow tunable too? */
118 117  
119   -void * __weak swiotlb_alloc_boot(size_t size, unsigned long nslabs)
  118 +void * __weak __init swiotlb_alloc_boot(size_t size, unsigned long nslabs)
120 119 {
121 120 return alloc_bootmem_low_pages(size);
122 121 }