Skip to content

Commit

Permalink
printk: rename printk_sched to printk_deferred
Browse files Browse the repository at this point in the history
commit aac74dc495456412c4130a1167ce4beb6c1f0b38 upstream.

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.

Signed-off-by: John Stultz <[email protected]>
Reviewed-by: Steven Rostedt <[email protected]>
Cc: Jan Kara <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Jiri Bohac <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
johnstultz-work authored and Panos committed Sep 16, 2017
1 parent bc4e4fd commit 94b7902
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions include/linux/printk.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,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
Expand Down Expand Up @@ -144,7 +144,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;
}
Expand Down
2 changes: 1 addition & 1 deletion kernel/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -2138,7 +2138,7 @@ late_initcall(printk_late_init);

#if defined CONFIG_PRINTK

int printk_sched(const char *fmt, ...)
int printk_deferred(const char *fmt, ...)
{
unsigned long flags;
va_list args;
Expand Down
2 changes: 1 addition & 1 deletion kernel/sched/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1381,7 +1381,7 @@ static int select_fallback_rq(int cpu, struct task_struct *p)
* 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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion kernel/sched/rt.c
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,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 {
/*
Expand Down

0 comments on commit 94b7902

Please sign in to comment.