Merge commit 'origin/HEAD' into test-merge

[mirror_ubuntu-artful-kernel.git] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index 8fb01c32aa3bb7eaf44f5b9e63e316628dd935c1..e2129e83fd75b8d0c708a7c410005015e0cba564 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -666,7 +666,7 @@ static int acquire_console_semaphore_for_printk(unsigned int cpu)
        return retval;
 }
 
-const char printk_recursion_bug_msg [] =
+static const char printk_recursion_bug_msg [] =
                        KERN_CRIT "BUG: recent printk recursion!\n";
 static int printk_recursion_bug;