X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=kernel%2Fkmod.c;h=49cc4b9c1a8d8ad8a0a602d7ea4cf0a6fe900a0b;hb=5335a40be6867eff986a31bcd8fc82a5cb1e16bb;hp=796276141e51902bd466b1f5b81b5220c109ca4a;hpb=9333907084da2b05db787dba3e714d0be7c84f36;p=powerpc.git

diff --git a/kernel/kmod.c b/kernel/kmod.c
index 796276141e..49cc4b9c1a 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -23,7 +23,6 @@
 #include <linux/syscalls.h>
 #include <linux/unistd.h>
 #include <linux/kmod.h>
-#include <linux/smp_lock.h>
 #include <linux/slab.h>
 #include <linux/mnt_namespace.h>
 #include <linux/completion.h>
@@ -166,6 +165,12 @@ static int ____call_usermodehelper(void *data)
 	/* We can run anywhere, unlike our parent keventd(). */
 	set_cpus_allowed(current, CPU_MASK_ALL);
 
+	/*
+	 * Our parent is keventd, which runs with elevated scheduling priority.
+	 * Avoid propagating that into the userspace child.
+	 */
+	set_user_nice(current, 0);
+
 	retval = -EPERM;
 	if (current->fs->root)
 		retval = kernel_execve(sub_info->path,