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

Commit 3a3b6ed2 authored by Dave Young's avatar Dave Young Committed by Linus Torvalds
Browse files

printk boot_delay: rename printk_delay_msec to loops_per_msec 



Rename `printk_delay_msec' to `loops_per_msec', because the patch "printk:
add printk_delay to make messages readable for some scenarios" wishes to
more appropriately use the `printk_delay_msec' identifier.

[akpm@linux-foundation.org: add a comment]
Signed-off-by: default avatarDave Young <hidave.darkstar@gmail.com>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5ae87e79

kernel/printk.c

+5 −7
Original line number Diff line number Diff line
@@ -206,12 +206,11 @@ __setup("log_buf_len=", log_buf_len_setup); 
#ifdef CONFIG_BOOT_PRINTK_DELAY



static unsigned int boot_delay; /* msecs delay after each printk during bootup */

static unsigned long long printk_delay_msec; /* per msec, based on boot_delay */

static unsigned long long loops_per_msec;	/* based on boot_delay */



static int __init boot_delay_setup(char *str)

{

	unsigned long lpj;

	unsigned long long loops_per_msec;



	lpj = preset_lpj ? preset_lpj : 1000000;	/* some guess */

	loops_per_msec = (unsigned long long)lpj / 1000 * HZ;
@@ -220,10 +219,9 @@ static int __init boot_delay_setup(char *str) 
	if (boot_delay > 10 * 1000)

		boot_delay = 0;



	printk_delay_msec = loops_per_msec;

	printk(KERN_DEBUG "boot_delay: %u, preset_lpj: %ld, lpj: %lu, "

		"HZ: %d, printk_delay_msec: %llu\n",

		boot_delay, preset_lpj, lpj, HZ, printk_delay_msec);

	pr_debug("boot_delay: %u, preset_lpj: %ld, lpj: %lu, "

		"HZ: %d, loops_per_msec: %llu\n",

		boot_delay, preset_lpj, lpj, HZ, loops_per_msec);

	return 1;

}

__setup("boot_delay=", boot_delay_setup);
@@ -236,7 +234,7 @@ static void boot_delay_msec(void) 
	if (boot_delay == 0 || system_state != SYSTEM_BOOTING)

		return;



	k = (unsigned long long)printk_delay_msec * boot_delay;

	k = (unsigned long long)loops_per_msec * boot_delay;



	timeout = jiffies + msecs_to_jiffies(boot_delay);

	while (k) {