Merge tag 'please-pull-fix-ia64-build' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os 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

Linus Torvalds 13 years ago c68fea34 3b5d8510

+6 -6

2 changed files

expand all

include

linux

sched

rt.h

sysctl.h

include/linux/sched/rt.h

··· 55 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 64 #endif /* _SCHED_RT_H */

-6

include/linux/sched/sysctl.h

··· 91 91 extern unsigned int sysctl_sched_autogroup_enabled; 92 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 94 extern int sched_rr_timeslice; 101 95 102 96 extern int sched_rr_handler(struct ctl_table *table, int write,