From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Rostedt Subject: Re: linux-next: build failure after merge of the ftrace tree Date: Fri, 21 Nov 2014 09:27:46 -0500 Message-ID: <20141121092746.7acc5d35@gandalf.local.home> References: <20141121183215.01ba539c@canb.auug.org.au> <20141121092036.09edee57@gandalf.local.home> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8BIT Return-path: In-Reply-To: <20141121092036.09edee57@gandalf.local.home> Sender: linux-kernel-owner@vger.kernel.org To: Jiri Kosina Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Petr Mladek , "Paul E. McKenney" List-Id: linux-next.vger.kernel.org On Fri, 21 Nov 2014 09:20:36 -0500 Steven Rostedt wrote: > > 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 > > #include > > #include > > +#include > > > > #include > > Unfortunately, this wasn't the fix. This was an allnoconfig, which > means printk wasn't defined. > Just to be safe, I put the printk.h back in. Although it doesn't seem to be needed. -- Steve >>From da1e044a557571fd3718bd161b7ce7f36d3f999e Mon Sep 17 00:00:00 2001 From: "Steven Rostedt (Red Hat)" 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. 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: Stephen Rothwell Signed-off-by: Steven Rostedt --- include/linux/percpu.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/percpu.h b/include/linux/percpu.h index ba2e85a0ff5b..87e9082a2bd4 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -134,7 +135,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 */ -- 1.8.1.4