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

Commit 7c7c239c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "pci_iomap: fix page fault issue on vmalloc with section mapping"

parents 7e6242a7 467cc1da

arch/arm/mm/iomap.c

+1 −2
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ EXPORT_SYMBOL(pcibios_min_mem); 


void pci_iounmap(struct pci_dev *dev, void __iomem *addr)

{

	if ((unsigned long)addr >= VMALLOC_START &&

	    (unsigned long)addr < VMALLOC_END)

	if (is_vmalloc_addr(addr))

		iounmap(addr);

}

EXPORT_SYMBOL(pci_iounmap);

arch/arm/mm/ioremap.c

+7 −0
Original line number Diff line number Diff line
@@ -119,10 +119,17 @@ void __check_vmalloc_seq(struct mm_struct *mm) 


	do {

		seq = init_mm.context.vmalloc_seq;

#ifdef CONFIG_ENABLE_VMALLOC_SAVING

		memcpy(pgd_offset(mm, PAGE_OFFSET),

				pgd_offset_k(PAGE_OFFSET),

				sizeof(pgd_t) * (pgd_index(VMALLOC_END) -

					pgd_index(PAGE_OFFSET)));

#else

		memcpy(pgd_offset(mm, VMALLOC_START),

		       pgd_offset_k(VMALLOC_START),

		       sizeof(pgd_t) * (pgd_index(VMALLOC_END) -

					pgd_index(VMALLOC_START)));

#endif

		mm->context.vmalloc_seq = seq;

	} while (seq != init_mm.context.vmalloc_seq);

}