Commit 463b7a17 authored by Ralph Campbell's avatar Ralph Campbell Committed by Linus Torvalds

mm: remove redundant check non_swap_entry()

In zap_pte_range(), the check for non_swap_entry() and
is_device_private_entry() is unnecessary since the latter is sufficient to
determine if the page is a device private page.  Remove the test for
non_swap_entry() to simplify the code and for clarity.
Signed-off-by: default avatarRalph Campbell <rcampbell@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Link: http://lkml.kernel.org/r/20200615175405.4613-1-rcampbell@nvidia.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a6f23d14
...@@ -1098,7 +1098,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, ...@@ -1098,7 +1098,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb,
} }
entry = pte_to_swp_entry(ptent); entry = pte_to_swp_entry(ptent);
if (non_swap_entry(entry) && is_device_private_entry(entry)) { if (is_device_private_entry(entry)) {
struct page *page = device_private_entry_to_page(entry); struct page *page = device_private_entry_to_page(entry);
if (unlikely(details && details->check_mapping)) { if (unlikely(details && details->check_mapping)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment