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

Commit f256b4a9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm, sched: Drop voluntary schedule from might_fault()"

parents 699281e7 244bcc23

include/linux/kernel.h

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ void might_fault(void); 
#else

static inline void might_fault(void)

{

	might_sleep();

	__might_sleep(__FILE__, __LINE__, 0);

}

#endif

mm/memory.c

+2 −1
Original line number Diff line number Diff line
@@ -4241,7 +4241,8 @@ void might_fault(void) 
	if (segment_eq(get_fs(), KERNEL_DS))

		return;



	might_sleep();

	__might_sleep(__FILE__, __LINE__, 0);



	/*

	 * it would be nicer only to annotate paths which are not under

	 * pagefault_disable, however that requires a larger audit and