Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 0b9886a00e74ba33ed59cafb8b02bc9d01570575..73217a9e2875b27909cb4c9db09a6ec2d4284a7c 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -488,7 +488,6 @@ void __init softirq_init(void)
 
 static int ksoftirqd(void * __bind_cpu)
 {
-       set_user_nice(current, 19);
        current->flags |= PF_NOFREEZE;
 
        set_current_state(TASK_INTERRUPTIBLE);