diff options
author | Jason Gunthorpe <jgg@nvidia.com> | 2021-11-01 14:49:20 -0300 |
---|---|---|
committer | Jason Gunthorpe <jgg@nvidia.com> | 2021-11-01 14:49:20 -0300 |
commit | a2a2a69d144d66e0c36697da062b3949e3c2c870 (patch) | |
tree | 3849e66b693137506434a1a8f579963c626e33b6 /include/linux/secretmem.h | |
parent | RDMA/irdma: optimize rx path by removing unnecessary copy (diff) | |
parent | Linux 5.15 (diff) | |
download | linux-dev-a2a2a69d144d66e0c36697da062b3949e3c2c870.tar.xz linux-dev-a2a2a69d144d66e0c36697da062b3949e3c2c870.zip |
Merge tag 'v5.15' into rdma.git for-next
Pull in the accepted for-rc patches as the next merge needs a newer base.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'include/linux/secretmem.h')
-rw-r--r-- | include/linux/secretmem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/secretmem.h b/include/linux/secretmem.h index 21c3771e6a56..988528b5da43 100644 --- a/include/linux/secretmem.h +++ b/include/linux/secretmem.h @@ -23,7 +23,7 @@ static inline bool page_is_secretmem(struct page *page) mapping = (struct address_space *) ((unsigned long)page->mapping & ~PAGE_MAPPING_FLAGS); - if (mapping != page->mapping) + if (!mapping || mapping != page->mapping) return false; return mapping->a_ops == &secretmem_aops; |