Merge branch 'rework/kthreads' into for-linus

[people/ms/linux.git] / include / linux / printk.h

diff --git a/include/linux/printk.h b/include/linux/printk.h
index 10ec29bc013567664a3fcb37c44b49c7f16664cc..f88ec15f83dccfa02c43d3b7c762e25237d3106e 100644 (file)
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -173,6 +173,7 @@ extern void printk_prefer_direct_enter(void);
 extern void printk_prefer_direct_exit(void);
 
 extern bool pr_flush(int timeout_ms, bool reset_on_progress);
+extern void try_block_console_kthreads(int timeout_ms);
 
 /*
  * Please don't use printk_ratelimit(), because it shares ratelimiting state
@@ -237,6 +238,10 @@ static inline bool pr_flush(int timeout_ms, bool reset_on_progress)
        return true;
 }
 
+static inline void try_block_console_kthreads(int timeout_ms)
+{
+}
+
 static inline int printk_ratelimit(void)
 {
        return 0;