aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2014-06-04 19:11:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-04 19:54:17 -0400
commitaac74dc495456412c4130a1167ce4beb6c1f0b38 (patch)
tree0a0b0cabf34a2840abdfd579743a8438f05dcdc7 /kernel
parent81954606265ab8f04b41154bd00576013affcf5b (diff)
printk: rename printk_sched to printk_deferred
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk/printk.c2
-rw-r--r--kernel/sched/core.c2
-rw-r--r--kernel/sched/deadline.c2
-rw-r--r--kernel/sched/rt.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index dc2b8bd9bc1e..35d9db251903 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2585,7 +2585,7 @@ void wake_up_klogd(void)
2585 preempt_enable(); 2585 preempt_enable();
2586} 2586}
2587 2587
2588int printk_sched(const char *fmt, ...) 2588int printk_deferred(const char *fmt, ...)
2589{ 2589{
2590 va_list args; 2590 va_list args;
2591 int r; 2591 int r;
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 913c6d6cc2c1..caf03e89a068 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1367,7 +1367,7 @@ out:
1367 * leave kernel. 1367 * leave kernel.
1368 */ 1368 */
1369 if (p->mm && printk_ratelimit()) { 1369 if (p->mm && printk_ratelimit()) {
1370 printk_sched("process %d (%s) no longer affine to cpu%d\n", 1370 printk_deferred("process %d (%s) no longer affine to cpu%d\n",
1371 task_pid_nr(p), p->comm, cpu); 1371 task_pid_nr(p), p->comm, cpu);
1372 } 1372 }
1373 } 1373 }
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index f9ca7d19781a..d17e1c48a79d 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,
352 352
353 if (!lag_once) { 353 if (!lag_once) {
354 lag_once = true; 354 lag_once = true;
355 printk_sched("sched: DL replenish lagged to much\n"); 355 printk_deferred("sched: DL replenish lagged to much\n");
356 } 356 }
357 dl_se->deadline = rq_clock(rq) + pi_se->dl_deadline; 357 dl_se->deadline = rq_clock(rq) + pi_se->dl_deadline;
358 dl_se->runtime = pi_se->dl_runtime; 358 dl_se->runtime = pi_se->dl_runtime;
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 0ebfd7a29472..5d7667b37c21 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)
896 896
897 if (!once) { 897 if (!once) {
898 once = true; 898 once = true;
899 printk_sched("sched: RT throttling activated\n"); 899 printk_deferred("sched: RT throttling activated\n");
900 } 900 }
901 } else { 901 } else {
902 /* 902 /*