projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'gart/fixes' into amd-iommu/2.6.33
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
printk.c
diff --git
a/kernel/printk.c
b/kernel/printk.c
index 932ea21feb18ef2ddc3ffcb805220a22cbc3991f..f38b07f78a4e864da8fb2c7bcc5a0641bd04e7b5 100644
(file)
--- a/
kernel/printk.c
+++ b/
kernel/printk.c
@@
-653,6
+653,20
@@
static int recursion_bug;
static int new_text_line = 1;
static char printk_buf[1024];
static int new_text_line = 1;
static char printk_buf[1024];
+int printk_delay_msec __read_mostly;
+
+static inline void printk_delay(void)
+{
+ if (unlikely(printk_delay_msec)) {
+ int m = printk_delay_msec;
+
+ while (m--) {
+ mdelay(1);
+ touch_nmi_watchdog();
+ }
+ }
+}
+
asmlinkage int vprintk(const char *fmt, va_list args)
{
int printed_len = 0;
asmlinkage int vprintk(const char *fmt, va_list args)
{
int printed_len = 0;
@@
-662,6
+676,7
@@
asmlinkage int vprintk(const char *fmt, va_list args)
char *p;
boot_delay_msec();
char *p;
boot_delay_msec();
+ printk_delay();
preempt_disable();
/* This stops the holder of console_sem just where we want him */
preempt_disable();
/* This stops the holder of console_sem just where we want him */