diff options
| author | Petr Mladek | 2018-08-14 13:36:15 +0200 |
|---|---|---|
| committer | Petr Mladek | 2018-08-14 13:36:15 +0200 |
| commit | 9f68cb579115faa211ae067b4628cf11162783fb (patch) | |
| tree | 051146dd180af1b8a368d1a53b78c78920e15f64 /include/linux/printk.h | |
| parent | lib/vsprintf: Do not handle %pO[^F] as %px (diff) | |
| parent | printk/nmi: Prevent deadlock when accessing the main log buffer in NMI (diff) | |
| download | kernel-qcow2-linux-9f68cb579115faa211ae067b4628cf11162783fb.tar.gz kernel-qcow2-linux-9f68cb579115faa211ae067b4628cf11162783fb.tar.xz kernel-qcow2-linux-9f68cb579115faa211ae067b4628cf11162783fb.zip | |
Merge branch 'for-4.19-nmi' into for-linus
Diffstat (limited to 'include/linux/printk.h')
| -rw-r--r-- | include/linux/printk.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/printk.h b/include/linux/printk.h index 18602bb3eca8..cf3eccfe1543 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -148,9 +148,13 @@ void early_printk(const char *s, ...) { } #ifdef CONFIG_PRINTK_NMI extern void printk_nmi_enter(void); extern void printk_nmi_exit(void); +extern void printk_nmi_direct_enter(void); +extern void printk_nmi_direct_exit(void); #else static inline void printk_nmi_enter(void) { } static inline void printk_nmi_exit(void) { } +static inline void printk_nmi_direct_enter(void) { } +static inline void printk_nmi_direct_exit(void) { } #endif /* PRINTK_NMI */ #ifdef CONFIG_PRINTK |