Browse Source

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>
John Stultz 11 years ago
parent
commit
aac74dc495
5 changed files with 7 additions and 7 deletions
  1. 3 3
      include/linux/printk.h
  2. 1 1
      kernel/printk/printk.c
  3. 1 1
      kernel/sched/core.c
  4. 1 1
      kernel/sched/deadline.c
  5. 1 1
      kernel/sched/rt.c

+ 3 - 3
include/linux/printk.h

@@ -128,9 +128,9 @@ asmlinkage __printf(1, 2) __cold
 int printk(const char *fmt, ...);
 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
  * Please don't use printk_ratelimit(), because it shares ratelimiting state
@@ -165,7 +165,7 @@ int printk(const char *s, ...)
 	return 0;
 	return 0;
 }
 }
 static inline __printf(1, 2) __cold
 static inline __printf(1, 2) __cold
-int printk_sched(const char *s, ...)
+int printk_deferred(const char *s, ...)
 {
 {
 	return 0;
 	return 0;
 }
 }

+ 1 - 1
kernel/printk/printk.c

@@ -2585,7 +2585,7 @@ void wake_up_klogd(void)
 	preempt_enable();
 	preempt_enable();
 }
 }
 
 
-int printk_sched(const char *fmt, ...)
+int printk_deferred(const char *fmt, ...)
 {
 {
 	va_list args;
 	va_list args;
 	int r;
 	int r;

+ 1 - 1
kernel/sched/core.c

@@ -1367,7 +1367,7 @@ out:
 		 * leave kernel.
 		 * leave kernel.
 		 */
 		 */
 		if (p->mm && printk_ratelimit()) {
 		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);
 					task_pid_nr(p), p->comm, cpu);
 		}
 		}
 	}
 	}

+ 1 - 1
kernel/sched/deadline.c

@@ -352,7 +352,7 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se,
 
 
 		if (!lag_once) {
 		if (!lag_once) {
 			lag_once = true;
 			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->deadline = rq_clock(rq) + pi_se->dl_deadline;
 		dl_se->runtime = pi_se->dl_runtime;
 		dl_se->runtime = pi_se->dl_runtime;

+ 1 - 1
kernel/sched/rt.c

@@ -896,7 +896,7 @@ static int sched_rt_runtime_exceeded(struct rt_rq *rt_rq)
 
 
 			if (!once) {
 			if (!once) {
 				once = true;
 				once = true;
-				printk_sched("sched: RT throttling activated\n");
+				printk_deferred("sched: RT throttling activated\n");
 			}
 			}
 		} else {
 		} else {
 			/*
 			/*