Skip to content

Commit

Permalink
printk: add dummy routine for when CONFIG_PRINTK=n
Browse files Browse the repository at this point in the history
There are missing dummy routines for log_buf_addr_get() and
log_buf_len_get() for when CONFIG_PRINTK is not set causing build
failures.

This patch adds these dummy routines at the appropriate location.

Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Pranith Kumar authored and Linus Torvalds committed Jan 26, 2015
1 parent 17636fa commit 07261ed
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions include/linux/printk.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
extern const char linux_banner[];
extern const char linux_proc_banner[];

extern char *log_buf_addr_get(void);
extern u32 log_buf_len_get(void);

static inline int printk_get_level(const char *buffer)
{
if (buffer[0] == KERN_SOH_ASCII && buffer[1]) {
Expand Down Expand Up @@ -163,6 +160,8 @@ extern int kptr_restrict;

extern void wake_up_klogd(void);

char *log_buf_addr_get(void);
u32 log_buf_len_get(void);
void log_buf_kexec_setup(void);
void __init setup_log_buf(int early);
void dump_stack_set_arch_desc(const char *fmt, ...);
Expand Down Expand Up @@ -198,6 +197,16 @@ static inline void wake_up_klogd(void)
{
}

static inline char *log_buf_addr_get(void)
{
return NULL;
}

static inline u32 log_buf_len_get(void)
{
return 0;
}

static inline void log_buf_kexec_setup(void)
{
}
Expand Down

0 comments on commit 07261ed

Please sign in to comment.