From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Kosina Subject: Re: linux-next: build failure after merge of the ftrace tree Date: Fri, 21 Nov 2014 11:50:22 +0100 (CET) Message-ID: References: <20141121183215.01ba539c@canb.auug.org.au> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-path: Received: from cantor2.suse.de ([195.135.220.15]:48862 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751230AbaKUKuR (ORCPT ); Fri, 21 Nov 2014 05:50:17 -0500 In-Reply-To: <20141121183215.01ba539c@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Steven Rostedt , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Petr Mladek , "Paul E. McKenney" On Fri, 21 Nov 2014, Stephen Rothwell wrote: > Hi Steven, > > After merging the ftrace tree, today's linux-next build (powerpc > allnoconfig) failed like this: > > In file included from include/asm-generic/percpu.h:6:0, > from arch/powerpc/include/asm/percpu.h:19, > from include/linux/percpu.h:11, > from include/linux/sched.h:41, > from arch/powerpc/kernel/asm-offsets.c:17: > include/linux/percpu.h:138:17: error: 'printk_func_t' undeclared here (not in a function) > DECLARE_PER_CPU(printk_func_t, printk_func); > ^ > include/linux/percpu-defs.h:101:38: note: in definition of macro 'DECLARE_PER_CPU_SECTION' > extern __PCPU_ATTRS(sec) __typeof__(type) name > ^ > include/linux/percpu.h:138:1: note: in expansion of macro 'DECLARE_PER_CPU' > DECLARE_PER_CPU(printk_func_t, printk_func); > ^ From: Jiri Kosina 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 Signed-off-by: Jiri Kosina --- 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 #include #include +#include #include -- Jiri Kosina SUSE Labs