Re: [PATCH 1/2] sched: move RR_TIMESLICE from sysctl.h to rt.h

[Tony Luck]

On Wed, Feb 20, 2013 at 7:19 AM, Clark Williams
<clark.williams@xxxxxxxxx> wrote:
> Signed-off-by: Clark Williams <clark.williams@xxxxxxxxx>
> ---

This happens to unbreak the ia64 build which is currently grumbling about:

arch/ia64/kernel/init_task.c:38: error: 'RR_TIMESLICE' undeclared here
(not in a function)

So I'd be happy if it got applied directly to Linus tree before I get too big of
a bisection gap.

Acked-by: Tony Luck <tony.luck@xxxxxxxxx>

>  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,
> --
> 1.8.1.2
>
> --
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/