projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
locking/static_key: Fix concurrent static_key_slow_inc()
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
sched
/
fair.c
diff --git
a/kernel/sched/fair.c
b/kernel/sched/fair.c
index 90e26b11deaa1ab4b78302605850523a7852720b..cfdc0e61066c20b926e0d5ca7ed5d9732a1c903b 100644
(file)
--- a/
kernel/sched/fair.c
+++ b/
kernel/sched/fair.c
@@
-2689,7
+2689,7
@@
static inline int update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq)
int decayed, removed = 0;
if (atomic_long_read(&cfs_rq->removed_load_avg)) {
int decayed, removed = 0;
if (atomic_long_read(&cfs_rq->removed_load_avg)) {
-
long
r = atomic_long_xchg(&cfs_rq->removed_load_avg, 0);
+
s64
r = atomic_long_xchg(&cfs_rq->removed_load_avg, 0);
sa->load_avg = max_t(long, sa->load_avg - r, 0);
sa->load_sum = max_t(s64, sa->load_sum - r * LOAD_AVG_MAX, 0);
removed = 1;
sa->load_avg = max_t(long, sa->load_avg - r, 0);
sa->load_sum = max_t(s64, sa->load_sum - r * LOAD_AVG_MAX, 0);
removed = 1;