Commit 06ef431a authored Oct 27, 2015 by Ingo Molnar

Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into core/efi



Pull EFI fix from Matt Fleming:

  - Fix a kernel panic by not passing EFI virtual mapping addresses to
    __pa() in the x86 pageattr code. Since these virtual addreses are
    not part of the direct mapping or kernel text mapping, passing them
    to __pa() will trigger a BUG_ON() when CONFIG_DEBUG_VIRTUAL is
    enabled. (Sai Praneeth Prakhya)

Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents 790a2ee2 2c66e24d

arch/x86/mm/pageattr.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -647,9 +647,12 @@ __split_large_page(struct cpa_data cpa, pte_t kpte, unsigned long address,
		for (i = 0; i < PTRS_PER_PTE; i++, pfn += pfninc)
		set_pte(&pbase[i], pfn_pte(pfn, canon_pgprot(ref_prot)));

		if (pfn_range_is_mapped(PFN_DOWN(__pa(address)),
		PFN_DOWN(__pa(address)) + 1))
		if (virt_addr_valid(address)) {
		unsigned long pfn = PFN_DOWN(__pa(address));

		if (pfn_range_is_mapped(pfn, pfn + 1))
		split_page_count(level);
		}

		/*
		* Install the new, split up pagetable.