Merge branch 'rework/printk_safe-removal' into for-linus
This commit is contained in:
@@ -198,6 +198,7 @@ void dump_stack_print_info(const char *log_lvl);
|
||||
void show_regs_print_info(const char *log_lvl);
|
||||
extern asmlinkage void dump_stack_lvl(const char *log_lvl) __cold;
|
||||
extern asmlinkage void dump_stack(void) __cold;
|
||||
void printk_trigger_flush(void);
|
||||
#else
|
||||
static inline __printf(1, 0)
|
||||
int vprintk(const char *s, va_list args)
|
||||
@@ -274,6 +275,9 @@ static inline void dump_stack_lvl(const char *log_lvl)
|
||||
static inline void dump_stack(void)
|
||||
{
|
||||
}
|
||||
static inline void printk_trigger_flush(void)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
|
||||
Reference in New Issue
Block a user