diff options
| author | Joerg Roedel | 2019-07-19 20:46:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-08-16 10:12:40 +0200 |
| commit | dd524d488f5bd2cc6421f1b82e8e87c104ec51ad (patch) | |
| tree | 65a2cada89d32d13bf5dbcd189066c1265b979a9 | |
| parent | Input: synaptics - enable RMI mode for HP Spectre X360 (diff) | |
| download | kernel-qcow2-linux-dd524d488f5bd2cc6421f1b82e8e87c104ec51ad.tar.gz kernel-qcow2-linux-dd524d488f5bd2cc6421f1b82e8e87c104ec51ad.tar.xz kernel-qcow2-linux-dd524d488f5bd2cc6421f1b82e8e87c104ec51ad.zip | |
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: 5d72b4fba40ef ('x86, mm: support huge I/O mapping capability I/F')
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lkml.kernel.org/r/20190719184652.11391-2-joro@8bytes.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/x86/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 9d9765e4d1ef..4d12176a470e 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -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; } |