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

Commit dd524d48 authored by Joerg Roedel's avatar Joerg Roedel Committed by Greg Kroah-Hartman
Browse files

x86/mm: Check for pfn instead of page in vmalloc_sync_one() 



commit 51b75b5b563a2637f9d8dc5bd02a31b2ff9e5ea0 upstream.

Do not require a struct page for the mapped memory location because it
might not exist. This can happen when an ioremapped region is mapped with
2MB pages.

Fixes: 5d72b4fb ('x86, mm: support huge I/O mapping capability I/F')
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: https://lkml.kernel.org/r/20190719184652.11391-2-joro@8bytes.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b8a2169b

arch/x86/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address) 
	if (!pmd_present(*pmd))

		set_pmd(pmd, *pmd_k);

	else

		BUG_ON(pmd_page(*pmd) != pmd_page(*pmd_k));

		BUG_ON(pmd_pfn(*pmd) != pmd_pfn(*pmd_k));



	return pmd_k;

}