Commit 6d751329 authored by Andrew Morton's avatar Andrew Morton
Browse files

Merge branch 'mm-hotfixes-stable' into mm-stable

parents 088b8aa5 59298997

arch/powerpc/mm/book3s64/radix_pgtable.c

+0 −9
Original line number Diff line number Diff line
@@ -937,15 +937,6 @@ pmd_t radix__pmdp_collapse_flush(struct vm_area_struct *vma, unsigned long addre 
	pmd = *pmdp;

	pmd_clear(pmdp);



	/*

	 * pmdp collapse_flush need to ensure that there are no parallel gup

	 * walk after this call. This is needed so that we can have stable

	 * page ref count when collapsing a page. We don't allow a collapse page

	 * if we have gup taken on the page. We can ensure that by sending IPI

	 * because gup walk happens with IRQ disabled.

	 */

	serialize_against_pte_lookup(vma->vm_mm);



	radix__flush_tlb_collapsed_pmd(vma->vm_mm, address);



	return pmd;

arch/x86/lib/usercopy.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n) 
	 * called from other contexts.

	 */

	pagefault_disable();

	ret = __copy_from_user_inatomic(to, from, n);

	ret = raw_copy_from_user(to, from, n);

	pagefault_enable();



	return ret;

arch/x86/mm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -4,10 +4,12 @@ KCOV_INSTRUMENT_tlb.o := n 
KCOV_INSTRUMENT_mem_encrypt.o		:= n

KCOV_INSTRUMENT_mem_encrypt_amd.o	:= n

KCOV_INSTRUMENT_mem_encrypt_identity.o	:= n

KCOV_INSTRUMENT_pgprot.o		:= n



KASAN_SANITIZE_mem_encrypt.o		:= n

KASAN_SANITIZE_mem_encrypt_amd.o	:= n

KASAN_SANITIZE_mem_encrypt_identity.o	:= n

KASAN_SANITIZE_pgprot.o		:= n



# Disable KCSAN entirely, because otherwise we get warnings that some functions

# reference __initdata sections.
@@ -17,6 +19,7 @@ ifdef CONFIG_FUNCTION_TRACER 
CFLAGS_REMOVE_mem_encrypt.o		= -pg

CFLAGS_REMOVE_mem_encrypt_amd.o		= -pg

CFLAGS_REMOVE_mem_encrypt_identity.o	= -pg

CFLAGS_REMOVE_pgprot.o			= -pg

endif



obj-y				:=  init.o init_$(BITS).o fault.o ioremap.o extable.o mmap.o \

fs/ntfs/super.c

+2 −1
Original line number Diff line number Diff line
@@ -2092,7 +2092,8 @@ static bool load_system_files(ntfs_volume *vol) 
	// TODO: Initialize security.

	/* Get the extended system files' directory inode. */

	vol->extend_ino = ntfs_iget(sb, FILE_Extend);

	if (IS_ERR(vol->extend_ino) || is_bad_inode(vol->extend_ino)) {

	if (IS_ERR(vol->extend_ino) || is_bad_inode(vol->extend_ino) ||

	    !S_ISDIR(vol->extend_ino->i_mode)) {

		if (!IS_ERR(vol->extend_ino))

			iput(vol->extend_ino);

		ntfs_error(sb, "Failed to load $Extend.");

fs/xfs/xfs_notify_failure.c

+3 −3
Original line number Diff line number Diff line
@@ -175,13 +175,13 @@ xfs_dax_notify_failure( 
	u64			ddev_start;

	u64			ddev_end;



	if (!(mp->m_sb.sb_flags & SB_BORN)) {

	if (!(mp->m_super->s_flags & SB_BORN)) {

		xfs_warn(mp, "filesystem is not ready for notify_failure()!");

		return -EIO;

	}



	if (mp->m_rtdev_targp && mp->m_rtdev_targp->bt_daxdev == dax_dev) {

		xfs_warn(mp,

		xfs_debug(mp,

			 "notify_failure() not supported on realtime device!");

		return -EOPNOTSUPP;

	}
@@ -194,7 +194,7 @@ xfs_dax_notify_failure( 
	}



	if (!xfs_has_rmapbt(mp)) {

		xfs_warn(mp, "notify_failure() needs rmapbt enabled!");

		xfs_debug(mp, "notify_failure() needs rmapbt enabled!");

		return -EOPNOTSUPP;

	}