UPSTREAM: sched/fair: Fix -Wunused-but-set-variable warnings

commit 763a9ec06c409dcde2a761aac4bb83ff3938e0b3 upstream.

Commit:

   de53fd7aedb1 ("sched/fair: Fix low cpu usage with high throttling by removing expiration of cpu-local slices")

introduced a few compilation warnings:

  kernel/sched/fair.c: In function '__refill_cfs_bandwidth_runtime':
  kernel/sched/fair.c:4365:6: warning: variable 'now' set but not used [-Wunused-but-set-variable]
  kernel/sched/fair.c: In function 'start_cfs_bandwidth':
  kernel/sched/fair.c:4992:6: warning: variable 'overrun' set but not used [-Wunused-but-set-variable]

Also, __refill_cfs_bandwidth_runtime() does no longer update the
expiration time, so fix the comments accordingly.

Signed-off-by: Qian Cai <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Reviewed-by: Ben Segall <[email protected]>
Reviewed-by: Dave Chiluk <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Fixes: de53fd7aedb1 ("sched/fair: Fix low cpu usage with high throttling by removing expiration of cpu-local slices")
Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

(cherry picked from commit e9c0fc4a7ccd9fc28e78685d17c1943839c5579a
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git linux-4.19.y)
Signed-off-by: Vaibhav Rustagi <[email protected]>

BUG=b:136009299
TEST=tryjob, customer verified that the problem is resolved.
RELEASE_NOTE=Fixed CFS quota throttling issue

Change-Id: Ie316f282964c04c65368e0f6c7e7166e0c45d14d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/1955917
Reviewed-by: Xuewei Zhang <[email protected]>
Reviewed-by: Roy Yang <[email protected]>
Commit-Queue: Vaibhav Rustagi <[email protected]>
Tested-by: Vaibhav Rustagi <[email protected]>
1 file changed