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

Commit 0578c3b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

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
parents 7d8a804c 52942b6b

arch/x86/kernel/pci-swiotlb_64.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

}