diff options
author | Clark Williams <clark.williams@gmail.com> | 2013-02-20 10:19:09 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-02-22 04:44:46 -0500 |
commit | 45ebd3945b2a3cf4eb89d5fb0090a3cb71af7973 (patch) | |
tree | a7d5c4431cc97d075514511ba7c2e5ace232cbb4 | |
parent | bbbfeac92beff40eb86c7f682a7f1395f9f0ae52 (diff) |
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>
-rw-r--r-- | include/linux/sched/rt.h | 6 | ||||
-rw-r--r-- | 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 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) | |||
55 | extern void normalize_rt_tasks(void); | 55 | extern void normalize_rt_tasks(void); |
56 | 56 | ||
57 | 57 | ||
58 | /* | ||
59 | * default timeslice is 100 msecs (used only for SCHED_RR tasks). | ||
60 | * Timeslices get refilled after they expire. | ||
61 | */ | ||
62 | #define RR_TIMESLICE (100 * HZ / 1000) | ||
63 | |||
58 | #endif /* _SCHED_RT_H */ | 64 | #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; | |||
91 | extern unsigned int sysctl_sched_autogroup_enabled; | 91 | extern unsigned int sysctl_sched_autogroup_enabled; |
92 | #endif | 92 | #endif |
93 | 93 | ||
94 | /* | ||
95 | * default timeslice is 100 msecs (used only for SCHED_RR tasks). | ||
96 | * Timeslices get refilled after they expire. | ||
97 | */ | ||
98 | #define RR_TIMESLICE (100 * HZ / 1000) | ||
99 | |||
100 | extern int sched_rr_timeslice; | 94 | extern int sched_rr_timeslice; |
101 | 95 | ||
102 | extern int sched_rr_handler(struct ctl_table *table, int write, | 96 | extern int sched_rr_handler(struct ctl_table *table, int write, |