Merge branches 'pm-devfreq' and 'pm-cpufreq'

* pm-devfreq:
  PM / devfreq: fix double kfree
  PM / devfreq: Fix governor_store()

* pm-cpufreq:
  cpufreq: prevent lockup on reading scaling_available_frequencies
  cpufreq: acpi_cpufreq: prevent crash on reading freqdomain_cpus

1 files changed, 8 insertions, 0 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 999fb0aef8f1..9cc773483624 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -3202,6 +3202,14 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
                         continue;
 
                 /*
+                 * Shared VMAs have their own reserves and do not affect
+                 * MAP_PRIVATE accounting but it is possible that a shared
+                 * VMA is using the same page so check and skip such VMAs.
+                 */
+                if (iter_vma->vm_flags & VM_MAYSHARE)
+                        continue;
+
+                /*
                  * Unmap the page from other VMAs without their own reserves.
                  * They get marked to be SIGKILLed if they fault in these
                  * areas. This is because a future no-page fault on this VMA