Commit-ID: 45ebd3945b2a3cf4eb89d5fb0090a3cb71af7973 Gitweb: http://git.kernel.org/tip/45ebd3945b2a3cf4eb89d5fb0090a3cb71af7973 Author: Clark Williams <clark.williams@xxxxxxxxx> AuthorDate: Wed, 20 Feb 2013 09:19:09 -0600 Committer: Ingo Molnar <mingo@xxxxxxxxxx> 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@xxxxxxxxx> Signed-off-by: Clark Williams <clark.williams@xxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> Link: http://lkml.kernel.org/r/1361373550-4011-2-git-send-email-clark.williams@xxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- 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, -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|