Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096

[karo-tx-linux.git] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index 865ecf57a09604cc1307407cc99f90c1cecc5309..cec2224bc9f5249293c4b2a15a2ad27416c45735 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -101,6 +101,8 @@ static int sched_create_user(struct user_struct *up)
        if (IS_ERR(up->tg))
                rc = -ENOMEM;
 
+       set_tg_uid(up);
+
        return rc;
 }
 
@@ -169,7 +171,7 @@ static ssize_t cpu_rt_runtime_show(struct kobject *kobj,
 {
        struct user_struct *up = container_of(kobj, struct user_struct, kobj);
 
-       return sprintf(buf, "%lu\n", sched_group_rt_runtime(up->tg));
+       return sprintf(buf, "%ld\n", sched_group_rt_runtime(up->tg));
 }
 
 static ssize_t cpu_rt_runtime_store(struct kobject *kobj,
@@ -180,7 +182,7 @@ static ssize_t cpu_rt_runtime_store(struct kobject *kobj,
        unsigned long rt_runtime;
        int rc;
 
-       sscanf(buf, "%lu", &rt_runtime);
+       sscanf(buf, "%ld", &rt_runtime);
 
        rc = sched_group_set_rt_runtime(up->tg, rt_runtime);