Merge branch 'rework/printk_safe-removal' into for-linus

[linux-2.6-block.git] / include / linux / printk.h

diff --git a/include/linux/printk.h b/include/linux/printk.h
index 85b656f82d752ecf18d67a693e4de0201ddd9a2e..9497f6b983399ac0cf6a21d5e4b57f9e144e2d74 100644 (file)
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -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