summaryrefslogtreecommitdiff
path: root/include/linux/sched.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-16 11:36:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-16 11:36:02 -0700
commit0052af4411b048eb6c0b0adb73d0fb4803ba1794 (patch)
tree453ad78b96810b1cd7271124a91bc5533c4ad81f /include/linux/sched.h
parent0fed3ac866eabf01924457921ee3684c8e4c9005 (diff)
parentd18d12d0ff07c47fb913f297c174f30a3f96042d (diff)
Merge branch 'core-lib-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core/lib update from Ingo Molnar: "This contains a single commit that removes an unused facility that the scheduler used to make use of" * 'core-lib-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: lib/proportions: Remove unused code
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r--include/linux/sched.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 52c4847b05e2..8db05e4e06a6 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -40,7 +40,6 @@ struct sched_param {
#include <linux/pid.h>
#include <linux/percpu.h>
#include <linux/topology.h>
-#include <linux/proportions.h>
#include <linux/seccomp.h>
#include <linux/rcupdate.h>
#include <linux/rculist.h>