diff options
| author | Dave Young <dyoung@redhat.com> | 2013-11-13 00:08:53 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 04:09:14 +0100 |
| commit | 29e9d22559065af169bba6f99166eb9ab64c01c6 (patch) | |
| tree | 130ed2064d5a50eac5b674c78026d0bda1a8cdfa /kernel/printk | |
| parent | vsprintf: check real user/group id for %pK (diff) | |
| download | linux-29e9d22559065af169bba6f99166eb9ab64c01c6.tar.xz linux-29e9d22559065af169bba6f99166eb9ab64c01c6.zip | |
kernel/printk/printk.c: enable boot delay for earlyprintk
boot_delay does not work for earlyprintk because the kernel cmdline
parsing is late.
Change to use early_param so early kernel messages can also be delayed.
Signed-off-by: Dave Young <dyoung@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/printk')
| -rw-r--r-- | kernel/printk/printk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 78b7c0f38259..9b527d41f8f1 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -820,9 +820,9 @@ static int __init boot_delay_setup(char *str) 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; + return 0; } -__setup("boot_delay=", boot_delay_setup); +early_param("boot_delay", boot_delay_setup); static void boot_delay_msec(int level) { |