From: tip-bot for Clark Williams <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
peterz@infradead.org, tony.luck@gmail.com,
clark.williams@gmail.com, rostedt@goodmis.org,
tglx@linutronix.de
Subject: [tip:sched/urgent] sched: Move RR_TIMESLICE from sysctl.h to rt.h
Date: Fri, 22 Feb 2013 04:43:20 -0800 [thread overview]
Message-ID: <tip-45ebd3945b2a3cf4eb89d5fb0090a3cb71af7973@git.kernel.org> (raw)
In-Reply-To: <1361373550-4011-2-git-send-email-clark.williams@gmail.com>
Commit-ID: 45ebd3945b2a3cf4eb89d5fb0090a3cb71af7973
Gitweb: http://git.kernel.org/tip/45ebd3945b2a3cf4eb89d5fb0090a3cb71af7973
Author: Clark Williams <clark.williams@gmail.com>
AuthorDate: Wed, 20 Feb 2013 09:19:09 -0600
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 22 Feb 2013 10:44:46 +0100
sched: Move RR_TIMESLICE from sysctl.h to rt.h
This fixes an ia64 build bug reported by Tony Luck.
Reported-by: Tony Luck <tony.luck@gmail.com>
Signed-off-by: Clark Williams <clark.williams@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1361373550-4011-2-git-send-email-clark.williams@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
include/linux/sched/rt.h | 6 ++++++
include/linux/sched/sysctl.h | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/linux/sched/rt.h b/include/linux/sched/rt.h
index 94e19ea..440434d 100644
--- a/include/linux/sched/rt.h
+++ b/include/linux/sched/rt.h
@@ -55,4 +55,10 @@ static inline bool tsk_is_pi_blocked(struct task_struct *tsk)
extern void normalize_rt_tasks(void);
+/*
+ * default timeslice is 100 msecs (used only for SCHED_RR tasks).
+ * Timeslices get refilled after they expire.
+ */
+#define RR_TIMESLICE (100 * HZ / 1000)
+
#endif /* _SCHED_RT_H */
diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
index d2bb0ae..bf8086b 100644
--- a/include/linux/sched/sysctl.h
+++ b/include/linux/sched/sysctl.h
@@ -91,12 +91,6 @@ extern unsigned int sysctl_sched_cfs_bandwidth_slice;
extern unsigned int sysctl_sched_autogroup_enabled;
#endif
-/*
- * default timeslice is 100 msecs (used only for SCHED_RR tasks).
- * Timeslices get refilled after they expire.
- */
-#define RR_TIMESLICE (100 * HZ / 1000)
-
extern int sched_rr_timeslice;
extern int sched_rr_handler(struct ctl_table *table, int write,
next prev parent reply other threads:[~2013-02-22 12:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 15:19 [PATCH 0/2] more sched.h reorganization Clark Williams
2013-02-20 15:19 ` [PATCH 1/2] sched: move RR_TIMESLICE from sysctl.h to rt.h Clark Williams
2013-02-20 17:02 ` Tony Luck
2013-02-20 17:50 ` Ingo Molnar
2013-02-20 19:17 ` Tony Luck
2013-02-22 12:43 ` tip-bot for Clark Williams [this message]
2013-02-20 15:19 ` [PATCH 2/2] sched: move clock definitions from sched.h to new file Clark Williams
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-45ebd3945b2a3cf4eb89d5fb0090a3cb71af7973@git.kernel.org \
--to=tipbot@zytor.com \
--cc=clark.williams@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@gmail.com \
/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