summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorClark Williams <clark.williams@gmail.com>2013-02-22 09:20:11 -0800
committerTony Luck <tony.luck@intel.com>2013-02-22 09:20:11 -0800
commitbc681593b588786e6326b3e5f78ccc1683e2269c (patch)
tree21079559473523bae1561314eb6c8ae50f2f7c28 /include/linux
parent2ef14f465b9e096531343f5b734cffc5f759f4a6 (diff)
downloadlinux-bc681593b588786e6326b3e5f78ccc1683e2269c.tar.gz
linux-bc681593b588786e6326b3e5f78ccc1683e2269c.tar.bz2
linux-bc681593b588786e6326b3e5f78ccc1683e2269c.zip
sched: move RR_TIMESLICE from sysctl.h to rt.h
Originally submitted by Clark Williams as part of a cleanup, but happens also to fix an ia64 build problem: arch/ia64/kernel/init_task.c:38: error: 'RR_TIMESLICE' undeclared here (not in a function) Signed-off-by: Clark Williams <clark.williams@gmail.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/sched/rt.h6
-rw-r--r--include/linux/sched/sysctl.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/sched/rt.h b/include/linux/sched/rt.h
index 94e19ea28fc3..440434df3627 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 d2bb0ae979d0..bf8086b2506e 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,