diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-23 13:30:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-23 13:30:47 +0200 |
| commit | f95b23a112f1a31ea042483540cd907b58d23a5f (patch) | |
| tree | 3d41d2f8cf1d66ed593deb12f25a30d2905eb077 /mm/memory.c | |
| parent | da20ab35180780e4a6eadc804544f1fa967f3567 (diff) | |
| parent | 58c3862b521ead4f69a24ef009a679cb3c519620 (diff) | |
Merge branch 'x86/urgent' into x86/asm, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index ec4e15494901..a728bed16c20 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -845,7 +845,7 @@ struct page *_vm_normal_page(struct vm_area_struct *vma, unsigned long addr, * vm_normal_page() so that we do not have to special case all * call site of vm_normal_page(). */ - if (likely(pfn < highest_memmap_pfn)) { + if (likely(pfn <= highest_memmap_pfn)) { struct page *page = pfn_to_page(pfn); if (is_device_public_page(page)) { |