| From aac74dc495456412c4130a1167ce4beb6c1f0b38 Mon Sep 17 00:00:00 2001 |
| From: John Stultz <john.stultz@linaro.org> |
| Date: Wed, 4 Jun 2014 16:11:40 -0700 |
| Subject: printk: rename printk_sched to printk_deferred |
| |
| From: John Stultz <john.stultz@linaro.org> |
| |
| 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 <john.stultz@linaro.org> |
| Reviewed-by: Steven Rostedt <rostedt@goodmis.org> |
| Cc: Jan Kara <jack@suse.cz> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Jiri Bohac <jbohac@suse.cz> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Cc: Ingo Molnar <mingo@redhat.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| include/linux/printk.h | 6 +++--- |
| kernel/printk.c | 2 +- |
| kernel/sched/core.c | 2 +- |
| kernel/sched/rt.c | 2 +- |
| 4 files changed, 6 insertions(+), 6 deletions(-) |
| |
| --- a/include/linux/printk.h |
| +++ b/include/linux/printk.h |
| @@ -101,9 +101,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 |
| @@ -133,7 +133,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; |
| } |
| --- a/kernel/printk.c |
| +++ b/kernel/printk.c |
| @@ -1653,7 +1653,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; |
| --- a/kernel/sched/core.c |
| +++ b/kernel/sched/core.c |
| @@ -1313,7 +1313,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); |
| } |
| } |
| --- a/kernel/sched/rt.c |
| +++ b/kernel/sched/rt.c |
| @@ -884,7 +884,7 @@ static int sched_rt_runtime_exceeded(str |
| |
| if (!once) { |
| once = true; |
| - printk_sched("sched: RT throttling activated\n"); |
| + printk_deferred("sched: RT throttling activated\n"); |
| } |
| } else { |
| /* |