diff options
-rw-r--r-- | include/linux/percpu.h | 1 | ||||
-rw-r--r-- | include/linux/printk.h | 4 | ||||
-rw-r--r-- | kernel/printk/printk.c | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index ba2e85a0ff5b..caebf2a758dc 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h @@ -5,6 +5,7 @@ #include <linux/preempt.h> #include <linux/smp.h> #include <linux/cpumask.h> +#include <linux/printk.h> #include <linux/pfn.h> #include <linux/init.h> diff --git a/include/linux/printk.h b/include/linux/printk.h index 3bbd979d32fb..c69be9ee8f48 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -124,6 +124,8 @@ static inline __printf(1, 2) __cold void early_printk(const char *s, ...) { } #endif +typedef int(*printk_func_t)(const char *fmt, va_list args); + #ifdef CONFIG_PRINTK asmlinkage __printf(5, 0) int vprintk_emit(int facility, int level, @@ -162,8 +164,6 @@ extern int kptr_restrict; extern void wake_up_klogd(void); -typedef int(*printk_func_t)(const char *fmt, va_list args); - void log_buf_kexec_setup(void); void __init setup_log_buf(int early); void dump_stack_set_arch_desc(const char *fmt, ...); diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index f7b723f98cb9..5af2b8bc88f0 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1896,6 +1896,9 @@ static size_t msg_print_text(const struct printk_log *msg, enum log_flags prev, bool syslog, char *buf, size_t size) { return 0; } static size_t cont_print_text(char *text, size_t size) { return 0; } +/* Still needs to be defined for users */ +DEFINE_PER_CPU(printk_func_t, printk_func); + #endif /* CONFIG_PRINTK */ #ifdef CONFIG_EARLY_PRINTK |