diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-23 04:27:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-23 04:27:23 +0100 |
| commit | c68fea3464cbe4f3e1382f9f74a7c04cdbfb92ad (patch) | |
| tree | 841ccba71799209e6fceaceb30a7b3aa1437ce9a | |
| parent | Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | sched: move RR_TIMESLICE from sysctl.h to rt.h (diff) | |
| download | linux-c68fea3464cbe4f3e1382f9f74a7c04cdbfb92ad.tar.xz linux-c68fea3464cbe4f3e1382f9f74a7c04cdbfb92ad.zip | |
Merge tag 'please-pull-fix-ia64-build' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 build breakage fix from Tony Luck.
* tag 'please-pull-fix-ia64-build' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
sched: move RR_TIMESLICE from sysctl.h to rt.h
| -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) 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, |