summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-07-19 11:55:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-07-19 11:55:24 -0700
commit43768f7ce0996590cb9588de71f026f30fb35581 (patch)
tree9d85b8c8bc3d9934857195016647651cf7a3cb42 /include
parent9413cd7792dc03608ec9b1f1f5c74fc54e714ed3 (diff)
parent01cfcde9c26d8555f0e6e9aea9d6049f87683998 (diff)
downloadlinux-stable-43768f7ce0996590cb9588de71f026f30fb35581.tar.gz
linux-stable-43768f7ce0996590cb9588de71f026f30fb35581.tar.bz2
linux-stable-43768f7ce0996590cb9588de71f026f30fb35581.zip
Merge tag 'sched-urgent-2020-07-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into master
Pull scheduler fixes from Thomas Gleixner: "A set of scheduler fixes: - Plug a load average accounting race which was introduced with a recent optimization casing load average to show bogus numbers. - Fix the rseq CPU id initialization for new tasks. sched_fork() does not update the rseq CPU id so the id is the stale id of the parent task, which can cause user space data corruption. - Handle a 0 return value of task_h_load() correctly in the load balancer, which does not decrease imbalance and therefore pulls until the maximum number of loops is reached, which might be all tasks just created by a fork bomb" * tag 'sched-urgent-2020-07-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/fair: handle case of task_h_load() returning 0 sched: Fix unreliable rseq cpu_id for new tasks sched: Fix loadavg accounting race
Diffstat (limited to 'include')
-rw-r--r--include/linux/sched.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 692e327d7455..683372943093 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -114,10 +114,6 @@ struct task_group;
#define task_is_stopped_or_traced(task) ((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0)
-#define task_contributes_to_load(task) ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \
- (task->flags & PF_FROZEN) == 0 && \
- (task->state & TASK_NOLOAD) == 0)
-
#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
/*