diff options
author | Joerg Roedel <jroedel@suse.de> | 2019-07-19 20:46:50 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-16 10:13:48 +0200 |
commit | 7e2e08356e15269b3bdc2a7155aa98a81d5dd23d (patch) | |
tree | 97fdf2c648df22a6c4d7f2fa069b0ecc8c11dd50 | |
parent | e99e7745d03fc50ba7c5b7c91c17294fee2d5991 (diff) | |
download | linux-stable-7e2e08356e15269b3bdc2a7155aa98a81d5dd23d.tar.gz linux-stable-7e2e08356e15269b3bdc2a7155aa98a81d5dd23d.tar.bz2 linux-stable-7e2e08356e15269b3bdc2a7155aa98a81d5dd23d.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 b162f92fd55c..407522db3d9e 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -266,7 +266,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; } |