lkml.org 
[lkml]   [2014]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: linux-next: build failure after merge of the ftrace tree

>
> From: Jiri Kosina <jkosina@suse.cz>
> Subject: [PATCH] printk: make sure printk_func_t is known in percpu.h
>
> Commit afdc34a3d3b8 ("printk: Add per_cpu printk func to allow printk to
> be diverted") caused percpu variable printk_func to be declared in
> percpu.h. Make sure that the corresponding type is known at the time of
> declaration.
>
> Fixes build failure on certain arch/config combinations.
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
> ---
> include/linux/percpu.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/include/linux/percpu.h b/include/linux/percpu.h
> index a3aa63e..c94c766 100644
> --- a/include/linux/percpu.h
> +++ b/include/linux/percpu.h
> @@ -7,6 +7,7 @@
> #include <linux/cpumask.h>
> #include <linux/pfn.h>
> #include <linux/init.h>
> +#include <linux/printk.h>
>
> #include <asm/percpu.h>

Unfortunately, this wasn't the fix. This was an allnoconfig, which
means printk wasn't defined.

-- Steve


From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
Date: Fri, 21 Nov 2014 09:16:58 -0500
Subject: [PATCH] printk/percpu: Do not 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.

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

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
include/linux/percpu.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index ba2e85a0ff5b..74398ef1d294 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -134,7 +134,9 @@ extern phys_addr_t per_cpu_ptr_to_phys(void *addr);
(typeof(type) __percpu *)__alloc_percpu(sizeof(type), \
__alignof__(type))

+#ifdef CONFIG_PRINTK
/* To avoid include hell, as printk can not declare this, we declare it here */
DECLARE_PER_CPU(printk_func_t, printk_func);
+#endif

#endif /* __LINUX_PERCPU_H */
--
2.1.1


\
 
 \ /
  Last update: 2014-11-21 16:01    [W:0.074 / U:7.620 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site