diff --git a/[refs] b/[refs] index 5a11f4e71928..84ad7117f026 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7cffc1f29c1bc729bc50c863c87f93f9b70994b +refs/heads/master: 0c70814c311581a6c86198db4f982aa683c68fb8 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 8841a915545d..cfa222a91539 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -8986,7 +8986,7 @@ static u64 cpu_shares_read_u64(struct cgroup *cgrp, struct cftype *cft) #endif #ifdef CONFIG_RT_GROUP_SCHED -static ssize_t cpu_rt_runtime_write(struct cgroup *cgrp, struct cftype *cft, +static int cpu_rt_runtime_write(struct cgroup *cgrp, struct cftype *cft, s64 val) { return sched_group_set_rt_runtime(cgroup_tg(cgrp), val);