sched: Sync the sched patches

Sync the scheduler related patches with the series posted https://lkml.kernel.org/r/20210928122339.502270600@linutronix.de Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
xanmod · Sep 30, 2021 · 34e1320 · 34e1320
1 parent 905d204
commit 34e1320
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/kernel/exit.c b/kernel/exit.c
@@ -60,11 +60,11 @@
 #include <linux/writeback.h>
 #include <linux/shm.h>
 #include <linux/kcov.h>
-#include <linux/kprobes.h>
 #include <linux/random.h>
 #include <linux/rcuwait.h>
 #include <linux/compat.h>
 #include <linux/io_uring.h>
+#include <linux/kprobes.h>
 
 #include <linux/uaccess.h>
 #include <asm/unistd.h>

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
@@ -4884,7 +4884,6 @@ static struct rq *finish_task_switch(struct task_struct *prev)
 	 *   provided by mmdrop(),
 	 * - a sync_core for SYNC_CORE.
 	 */
-
 	if (mm) {
 		membarrier_mm_sync_core_before_usermode(mm);
 		mmdrop_sched(mm);