Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04b74b27 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

printk/percpu: Define printk_func when printk is not defined 

To avoid include hell, the per_cpu variable printk_func was declared
in percpu.h. But it is only defined if printk is defined.

As users of printk may also use the printk_func variable, it needs to
be defined even if CONFIG_PRINTK is not.

Also add a printk.h include in percpu.h just to be safe.

Link: http://lkml.kernel.org/r/20141121183215.01ba539c@canb.auug.org.au



Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent a9edc880

include/linux/percpu.h

+1 −0
Original line number Diff line number Diff line
@@ -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>

include/linux/printk.h

+2 −2
Original line number Diff line number Diff line
@@ -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, ...);

kernel/printk/printk.c

+3 −0
Original line number Diff line number Diff line
@@ -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