Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79fc170b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'akpm' 

Fixes from Andrew:

* akpm:
  fs/fat/fatent.c: add cond_resched() to fat_count_free_clusters()
  mm/thp: fix call to mmu_notifier in set_pmd_migration_entry() v2
  mm/mmap.c: don't clobber partially overlapping VMA with MAP_FIXED_NOREPLACE
  ocfs2: fix a GCC warning
parents cafa017d ac081c3b

fs/fat/fatent.c

+1 −0
Original line number Diff line number Diff line
@@ -682,6 +682,7 @@ int fat_count_free_clusters(struct super_block *sb) 
			if (ops->ent_get(&fatent) == FAT_ENT_FREE)

				free++;

		} while (fat_ent_next(sbi, &fatent));

		cond_resched();

	}

	sbi->free_clusters = free;

	sbi->free_clus_valid = 1;

fs/ocfs2/dlmglue.c

+2 −0
Original line number Diff line number Diff line
@@ -96,7 +96,9 @@ struct ocfs2_unblock_ctl { 
};



/* Lockdep class keys */

#ifdef CONFIG_DEBUG_LOCK_ALLOC

static struct lock_class_key lockdep_keys[OCFS2_NUM_LOCK_TYPES];

#endif



static int ocfs2_check_meta_downconvert(struct ocfs2_lock_res *lockres,

					int new_level);

mm/huge_memory.c

+0 −6
Original line number Diff line number Diff line
@@ -2885,9 +2885,6 @@ void set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw, 
	if (!(pvmw->pmd && !pvmw->pte))

		return;



	mmu_notifier_invalidate_range_start(mm, address,

			address + HPAGE_PMD_SIZE);



	flush_cache_range(vma, address, address + HPAGE_PMD_SIZE);

	pmdval = *pvmw->pmd;

	pmdp_invalidate(vma, address, pvmw->pmd);
@@ -2900,9 +2897,6 @@ void set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw, 
	set_pmd_at(mm, address, pvmw->pmd, pmdswp);

	page_remove_rmap(page, true);

	put_page(page);



	mmu_notifier_invalidate_range_end(mm, address,

			address + HPAGE_PMD_SIZE);

}



void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new)

mm/mmap.c

+1 −1
Original line number Diff line number Diff line
@@ -1410,7 +1410,7 @@ unsigned long do_mmap(struct file *file, unsigned long addr, 
	if (flags & MAP_FIXED_NOREPLACE) {

		struct vm_area_struct *vma = find_vma(mm, addr);



		if (vma && vma->vm_start <= addr)

		if (vma && vma->vm_start < addr + len)

			return -EEXIST;

	}