diff --git a/[refs] b/[refs] index 0eabf403686f..09f426601f9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a4f3ea77e1b0c72a3ec136c881eb0d64aa1d25e +refs/heads/master: ecf691daf7afb418537ba459290191a0a5853be5 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index ed8cebf53286..b2bc8fa24ba7 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -657,7 +657,7 @@ calc_delta_mine(unsigned long delta_exec, unsigned long weight, tmp = (tmp * lw->inv_weight) >> WMULT_SHIFT; } - return (unsigned long)min(tmp, (u64)sysctl_sched_runtime_limit); + return (unsigned long)min(tmp, (u64)(unsigned long)LONG_MAX); } static inline unsigned long