Re: [PATCH 2/4] printk: Rename printk_sched to printk_deferred

[Jan Kara]

On Mon 05-05-14 13:47:42, John Stultz wrote:
> After learning we'll need some sort of deferred printk functionality
> in the timekeeping core, Peter suggested we rename the printk_sched
> function so it can be reused by needed subsystems.
> 
> This only changes the function name. No logic changes.
  Fine by me. You can add:
Reviewed-by: Jan Kara <jack@xxxxxxx>

								Honza

> 
> Cc: Jan Kara <jack@xxxxxxx>
> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> Cc: Jiri Bohac <jbohac@xxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxxxxx>
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
> Reviewed-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
> Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
> ---
>  include/linux/printk.h  | 6 +++---
>  kernel/printk/printk.c  | 2 +-
>  kernel/sched/core.c     | 2 +-
>  kernel/sched/deadline.c | 2 +-
>  kernel/sched/rt.c       | 2 +-
>  5 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/include/linux/printk.h b/include/linux/printk.h
> index 8752f75..7847301 100644
> --- a/include/linux/printk.h
> +++ b/include/linux/printk.h
> @@ -128,9 +128,9 @@ asmlinkage __printf(1, 2) __cold
>  int printk(const char *fmt, ...);
>  
>  /*
> - * Special printk facility for scheduler use only, _DO_NOT_USE_ !
> + * Special printk facility for scheduler/timekeeping use only, _DO_NOT_USE_ !
>   */
> -__printf(1, 2) __cold int printk_sched(const char *fmt, ...);
> +__printf(1, 2) __cold int printk_deferred(const char *fmt, ...);
>  
>  /*
>   * Please don't use printk_ratelimit(), because it shares ratelimiting state
> @@ -165,7 +165,7 @@ int printk(const char *s, ...)
>  	return 0;
>  }
>  static inline __printf(1, 2) __cold
> -int printk_sched(const char *s, ...)
> +int printk_deferred(const char *s, ...)
>  {
>  	return 0;
>  }
> diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
> index 57467df..7587f67 100644
> --- a/kernel/printk/printk.c
> +++ b/kernel/printk/printk.c
> @@ -2584,7 +2584,7 @@ void wake_up_klogd(void)
>  	preempt_enable();
>  }
>  
> -int printk_sched(const char *fmt, ...)
> +int printk_deferred(const char *fmt, ...)
>  {
>  	va_list args;
>  	int r;
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index 805b8a9..263c790 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -1336,7 +1336,7 @@ out:
>  		 * leave kernel.
>  		 */
>  		if (p->mm && printk_ratelimit()) {
> -			printk_sched("process %d (%s) no longer affine to cpu%d\n",
> +			printk_deferred("process %d (%s) no longer affine to cpu%d\n",
>  					task_pid_nr(p), p->comm, cpu);
>  		}
>  	}
> diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
> index b080957..657ed68 100644
> --- a/kernel/sched/deadline.c
> +++ b/kernel/sched/deadline.c
> @@ -352,7 +352,7 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se,
>  
>  		if (!lag_once) {
>  			lag_once = true;
> -			printk_sched("sched: DL replenish lagged to much\n");
> +			printk_deferred("sched: DL replenish lagged to much\n");
>  		}
>  		dl_se->deadline = rq_clock(rq) + pi_se->dl_deadline;
>  		dl_se->runtime = pi_se->dl_runtime;
> diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
> index 7795e29..e7dc728 100644
> --- a/kernel/sched/rt.c
> +++ b/kernel/sched/rt.c
> @@ -896,7 +896,7 @@ static int sched_rt_runtime_exceeded(struct rt_rq *rt_rq)
>  
>  			if (!once) {
>  				once = true;
> -				printk_sched("sched: RT throttling activated\n");
> +				printk_deferred("sched: RT throttling activated\n");
>  			}
>  		} else {
>  			/*
> -- 
> 1.9.1
> 
-- 
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
--
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/