The patch titled Subject: printk: add dummy routine for when CONFIG_PRINTK=n has been added to the -mm tree. Its filename is printk-add-dummy-routine-for-when-config_printk=n.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/printk-add-dummy-routine-for-when-config_printk%3Dn.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/printk-add-dummy-routine-for-when-config_printk%3Dn.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Pranith Kumar <bobby.prani@xxxxxxxxx> Subject: printk: add dummy routine for when CONFIG_PRINTK=n 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@xxxxxxxxx> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx> Reviewed-by: Petr Mladek <pmladek@xxxxxxx> Acked-by: Steven Rostedt <rostedt@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/printk.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff -puN include/linux/printk.h~printk-add-dummy-routine-for-when-config_printk=n include/linux/printk.h --- a/include/linux/printk.h~printk-add-dummy-routine-for-when-config_printk=n +++ a/include/linux/printk.h @@ -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]) { @@ -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, ...); @@ -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) { } _ Patches currently in -mm which might be from bobby.prani@xxxxxxxxx are printk-add-dummy-routine-for-when-config_printk=n.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html