Merge tag 'block-5.15-2021-09-05' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / kernel / printk / internal.h

diff --git a/kernel/printk/internal.h b/kernel/printk/internal.h
index 1596e28..9f3ed2f 100644 (file)
--- a/kernel/printk/internal.h
+++ b/kernel/printk/internal.h
@@ -6,12 +6,6 @@
 
 #ifdef CONFIG_PRINTK
 
-#define PRINTK_SAFE_CONTEXT_MASK       0x007ffffff
-#define PRINTK_NMI_DIRECT_CONTEXT_MASK 0x008000000
-#define PRINTK_NMI_CONTEXT_MASK                0xff0000000
-
-#define PRINTK_NMI_CONTEXT_OFFSET      0x010000000
-
 /* Flags for a single printk record. */
 enum printk_info_flags {
        LOG_NEWLINE     = 2,    /* text ended with a newline */
@@ -25,10 +19,7 @@ int vprintk_store(int facility, int level,
 
 __printf(1, 0) int vprintk_default(const char *fmt, va_list args);
 __printf(1, 0) int vprintk_deferred(const char *fmt, va_list args);
-void __printk_safe_enter(void);
-void __printk_safe_exit(void);
 
-void printk_safe_init(void);
 bool printk_percpu_data_ready(void);
 
 #define printk_safe_enter_irqsave(flags)       \
@@ -43,18 +34,6 @@ bool printk_percpu_data_ready(void);
                local_irq_restore(flags);       \
        } while (0)
 
-#define printk_safe_enter_irq()                \
-       do {                                    \
-               local_irq_disable();            \
-               __printk_safe_enter();          \
-       } while (0)
-
-#define printk_safe_exit_irq()                 \
-       do {                                    \
-               __printk_safe_exit();           \
-               local_irq_enable();             \
-       } while (0)
-
 void defer_console_output(void);
 
 u16 printk_parse_prefix(const char *text, int *level,
@@ -69,9 +48,5 @@ u16 printk_parse_prefix(const char *text, int *level,
 #define printk_safe_enter_irqsave(flags) local_irq_save(flags)
 #define printk_safe_exit_irqrestore(flags) local_irq_restore(flags)
 
-#define printk_safe_enter_irq() local_irq_disable()
-#define printk_safe_exit_irq() local_irq_enable()
-
-static inline void printk_safe_init(void) { }
 static inline bool printk_percpu_data_ready(void) { return false; }
 #endif /* CONFIG_PRINTK */