Merge branch 'for-4.19-nmi' into for-linus
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user