diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2026-10-08 15:24:49 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2026-10-08 15:24:49 -0700 |
| commit | fbd3c33ceddb79f48ef8b55245fa4288ea752bc5 (patch) | |
| tree | 46fefb1b64d6489a443614734e27affd50e548de /drivers | |
| parent | e95d29c5df84f19881cd30b491fc81aa98f44b45 (diff) | |
| parent | 80ce29104123be4d61b5912dae543c70af0fcb75 (diff) | |
| download | linux-fbd3c33ceddb79f48ef8b55245fa4288ea752bc5.tar.gz linux-fbd3c33ceddb79f48ef8b55245fa4288ea752bc5.zip | |
Merge branch 'mm-hotfixes-stable' to pick up
"drivers/char/mem: mmap readonly MAP_SHARED-/dev/zero correctly"
required for cleanly merging mm-unstable's
"mm: update comments to refer to anon rmap rather than anon_vma"
"mm: move drivers/char/mem.c to mm/char-mem.c"
into mm-stable.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 63253d1de5d7..5b93c92c2cf1 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -503,7 +503,7 @@ static int mmap_zero_prepare(struct vm_area_desc *desc) #ifndef CONFIG_MMU return -ENOSYS; #endif - if (vma_desc_test(desc, VMA_SHARED_BIT)) + if (vma_desc_test(desc, VMA_MAYSHARE_BIT)) return shmem_zero_setup_desc(desc); /* |