Merge branch 'acpi-misc'

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

diff --git a/include/linux/printk.h b/include/linux/printk.h
index 34c1a7b..fe7eb23 100644 (file)
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -12,6 +12,8 @@
 extern const char linux_banner[];
 extern const char linux_proc_banner[];
 
+extern int oops_in_progress;   /* If set, an oops, panic(), BUG() or die() is in progress */
+
 #define PRINTK_MAX_SINGLE_HEADER_LEN 2
 
 static inline int printk_get_level(const char *buffer)
@@ -159,10 +161,12 @@ static inline void printk_nmi_direct_enter(void) { }
 static inline void printk_nmi_direct_exit(void) { }
 #endif /* PRINTK_NMI */
 
+struct dev_printk_info;
+
 #ifdef CONFIG_PRINTK
-asmlinkage __printf(5, 0)
+asmlinkage __printf(4, 0)
 int vprintk_emit(int facility, int level,
-                const char *dict, size_t dictlen,
+                const struct dev_printk_info *dev_info,
                 const char *fmt, va_list args);
 
 asmlinkage __printf(1, 0)
@@ -433,7 +437,7 @@ extern int kptr_restrict;
 #ifdef CONFIG_PRINTK
 #define printk_once(fmt, ...)                                  \
 ({                                                             \
-       static bool __section(.data.once) __print_once;         \
+       static bool __section(".data.once") __print_once;       \
        bool __ret_print_once = !__print_once;                  \
                                                                \
        if (!__print_once) {                                    \
@@ -444,7 +448,7 @@ extern int kptr_restrict;
 })
 #define printk_deferred_once(fmt, ...)                         \
 ({                                                             \
-       static bool __section(.data.once) __print_once;         \
+       static bool __section(".data.once") __print_once;       \
        bool __ret_print_once = !__print_once;                  \
                                                                \
        if (!__print_once) {                                    \