diff options
Diffstat (limited to 'kernel/printk.c')
-rw-r--r-- | kernel/printk.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 602033acd6c7..932ea21feb18 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -206,12 +206,11 @@ __setup("log_buf_len=", log_buf_len_setup); | |||
206 | #ifdef CONFIG_BOOT_PRINTK_DELAY | 206 | #ifdef CONFIG_BOOT_PRINTK_DELAY |
207 | 207 | ||
208 | static unsigned int boot_delay; /* msecs delay after each printk during bootup */ | 208 | static unsigned int boot_delay; /* msecs delay after each printk during bootup */ |
209 | static unsigned long long printk_delay_msec; /* per msec, based on boot_delay */ | 209 | static unsigned long long loops_per_msec; /* based on boot_delay */ |
210 | 210 | ||
211 | static int __init boot_delay_setup(char *str) | 211 | static int __init boot_delay_setup(char *str) |
212 | { | 212 | { |
213 | unsigned long lpj; | 213 | unsigned long lpj; |
214 | unsigned long long loops_per_msec; | ||
215 | 214 | ||
216 | lpj = preset_lpj ? preset_lpj : 1000000; /* some guess */ | 215 | lpj = preset_lpj ? preset_lpj : 1000000; /* some guess */ |
217 | loops_per_msec = (unsigned long long)lpj / 1000 * HZ; | 216 | loops_per_msec = (unsigned long long)lpj / 1000 * HZ; |
@@ -220,10 +219,9 @@ static int __init boot_delay_setup(char *str) | |||
220 | if (boot_delay > 10 * 1000) | 219 | if (boot_delay > 10 * 1000) |
221 | boot_delay = 0; | 220 | boot_delay = 0; |
222 | 221 | ||
223 | printk_delay_msec = loops_per_msec; | 222 | pr_debug("boot_delay: %u, preset_lpj: %ld, lpj: %lu, " |
224 | printk(KERN_DEBUG "boot_delay: %u, preset_lpj: %ld, lpj: %lu, " | 223 | "HZ: %d, loops_per_msec: %llu\n", |
225 | "HZ: %d, printk_delay_msec: %llu\n", | 224 | boot_delay, preset_lpj, lpj, HZ, loops_per_msec); |
226 | boot_delay, preset_lpj, lpj, HZ, printk_delay_msec); | ||
227 | return 1; | 225 | return 1; |
228 | } | 226 | } |
229 | __setup("boot_delay=", boot_delay_setup); | 227 | __setup("boot_delay=", boot_delay_setup); |
@@ -236,7 +234,7 @@ static void boot_delay_msec(void) | |||
236 | if (boot_delay == 0 || system_state != SYSTEM_BOOTING) | 234 | if (boot_delay == 0 || system_state != SYSTEM_BOOTING) |
237 | return; | 235 | return; |
238 | 236 | ||
239 | k = (unsigned long long)printk_delay_msec * boot_delay; | 237 | k = (unsigned long long)loops_per_msec * boot_delay; |
240 | 238 | ||
241 | timeout = jiffies + msecs_to_jiffies(boot_delay); | 239 | timeout = jiffies + msecs_to_jiffies(boot_delay); |
242 | while (k) { | 240 | while (k) { |