ASoC: Intel: sof-rt5682: add a check for devm_clk_get

[linux.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index eb3e2e558da13d85937ee5bd547ffd591708bf02..fed1b6e9c89b4361c68100fec1bfb3e693dc9918 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1261,7 +1261,9 @@ unsigned long do_mmap(struct file *file,
        add_nommu_region(region);
 
        /* clear anonymous mappings that don't ask for uninitialized data */
-       if (!vma->vm_file && !(flags & MAP_UNINITIALIZED))
+       if (!vma->vm_file &&
+           (!IS_ENABLED(CONFIG_MMAP_ALLOW_UNINITIALIZED) ||
+            !(flags & MAP_UNINITIALIZED)))
                memset((void *)region->vm_start, 0,
                       region->vm_end - region->vm_start);