Commit c68fea34 authored Feb 22, 2013 by Linus Torvalds

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

parents 3b5d8510 bc681593

include/linux/sched/rt.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -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 */

include/linux/sched/sysctl.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -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,