Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aac74dc4 authored by John Stultz's avatar John Stultz Committed by Linus Torvalds
Browse files

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: default avatarJohn Stultz <john.stultz@linaro.org>
Reviewed-by: default avatarSteven 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 81954606

include/linux/printk.h

+3 −3
Original line number Diff line number Diff line
@@ -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;

}

kernel/printk/printk.c

+1 −1
Original line number Diff line number Diff line
@@ -2585,7 +2585,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;

kernel/sched/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1367,7 +1367,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);

		}

	}

kernel/sched/deadline.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

kernel/sched/rt.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {

			/*