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

Merge branch 'linus' into core/iommu

Browse Source 
Conflicts:
	arch/ia64/include/asm/dma-mapping.h
	arch/ia64/include/asm/machvec.h
	arch/ia64/include/asm/machvec_sn2.h
This commit is contained in:
Ingo Molnar
2009-01-16 10:09:10 +01:00
parent 961d7d0ee5 7cb36b6ccd
commit af2519fb22
817 changed files with 33115 additions and 7326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/ia64/sn/pci/pci_dma.c
View File

@@ -347,6 +347,12 @@ static int sn_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
return 0;
}
u64 sn_dma_get_required_mask(struct device *dev)
{
return DMA_64BIT_MASK;
}
EXPORT_SYMBOL_GPL(sn_dma_get_required_mask);
char *sn_pci_get_legacy_mem(struct pci_bus *bus)
{
if (!SN_PCIBUS_BUSSOFT(bus))