From: tip-bot for Paul Gortmaker <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
fweisbec@gmail.com, a.p.zijlstra@chello.nl, tglx@linutronix.de,
paul.gortmaker@windriver.com
Subject: [tip:sched/urgent] sched: Move update_load_*() methods from sched.h to fair.c
Date: Tue, 7 May 2013 07:12:03 -0700 [thread overview]
Message-ID: <tip-8527632dc95472adb571701e852479531c0567a2@git.kernel.org> (raw)
In-Reply-To: <1366398650-31599-3-git-send-email-paul.gortmaker@windriver.com>
Commit-ID: 8527632dc95472adb571701e852479531c0567a2
Gitweb: http://git.kernel.org/tip/8527632dc95472adb571701e852479531c0567a2
Author: Paul Gortmaker <paul.gortmaker@windriver.com>
AuthorDate: Fri, 19 Apr 2013 15:10:50 -0400
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 7 May 2013 13:14:51 +0200
sched: Move update_load_*() methods from sched.h to fair.c
These inlines are only used by kernel/sched/fair.c so they do
not need to be present in the main kernel/sched/sched.h file.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/1366398650-31599-3-git-send-email-paul.gortmaker@windriver.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/sched/fair.c | 18 ++++++++++++++++++
kernel/sched/sched.h | 18 ------------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index c61a614..08a554d 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -113,6 +113,24 @@ unsigned int __read_mostly sysctl_sched_shares_window = 10000000UL;
unsigned int sysctl_sched_cfs_bandwidth_slice = 5000UL;
#endif
+static inline void update_load_add(struct load_weight *lw, unsigned long inc)
+{
+ lw->weight += inc;
+ lw->inv_weight = 0;
+}
+
+static inline void update_load_sub(struct load_weight *lw, unsigned long dec)
+{
+ lw->weight -= dec;
+ lw->inv_weight = 0;
+}
+
+static inline void update_load_set(struct load_weight *lw, unsigned long w)
+{
+ lw->weight = w;
+ lw->inv_weight = 0;
+}
+
/*
* Increase the granularity value when there are more CPUs,
* because with more CPUs the 'effective latency' as visible
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index a38ee0a..f1f6256 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -892,24 +892,6 @@ static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
#define WF_FORK 0x02 /* child wakeup after fork */
#define WF_MIGRATED 0x4 /* internal use, task got migrated */
-static inline void update_load_add(struct load_weight *lw, unsigned long inc)
-{
- lw->weight += inc;
- lw->inv_weight = 0;
-}
-
-static inline void update_load_sub(struct load_weight *lw, unsigned long dec)
-{
- lw->weight -= dec;
- lw->inv_weight = 0;
-}
-
-static inline void update_load_set(struct load_weight *lw, unsigned long w)
-{
- lw->weight = w;
- lw->inv_weight = 0;
-}
-
/*
* To aid in avoiding the subversion of "niceness" due to uneven distribution
* of tasks with abnormal "nice" values across CPUs the contribution that
next prev parent reply other threads:[~2013-05-07 14:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-19 19:10 [PATCHv2 0/2] sched: move content out of core files for load calculations Paul Gortmaker
2013-04-19 19:10 ` [PATCHv2 1/2] sched: fork load calculation code from sched/core --> sched/proc Paul Gortmaker
2013-05-07 14:10 ` [tip:sched/urgent] sched: Factor out load calculation code from sched/core.c --> sched/proc.c tip-bot for Paul Gortmaker
2013-04-19 19:10 ` [PATCHv2 2/2] sched: move update_load_[add/sub/set] from sched.h to fair.c Paul Gortmaker
2013-05-07 14:12 ` tip-bot for Paul Gortmaker [this message]
2013-04-21 9:18 ` [PATCHv2 0/2] sched: move content out of core files for load calculations Ingo Molnar
2013-05-06 9:26 ` Ingo Molnar
2013-05-06 14:21 ` Paul Gortmaker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-8527632dc95472adb571701e852479531c0567a2@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome