Commit 463b7a17 authored Aug 06, 2020 by Ralph Campbell Committed by Linus Torvalds Aug 07, 2020

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: Ralph Campbell <rcampbell@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Acked-by: David Hildenbrand <david@redhat.com>
Link: http://lkml.kernel.org/r/20200615175405.4613-1-rcampbell@nvidia.com


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent a6f23d14

mm/memory.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1098,7 +1098,7 @@ again:
		}

		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);

		if (unlikely(details && details->check_mapping)) {

Admin message