From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751336AbbKAG51 (ORCPT ); Sun, 1 Nov 2015 01:57:27 -0500 Received: from ozlabs.org ([103.22.144.67]:60796 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750830AbbKAG5Y (ORCPT ); Sun, 1 Nov 2015 01:57:24 -0500 Date: Sun, 1 Nov 2015 17:57:18 +1100 From: Stephen Rothwell To: "Rafael J. Wysocki" , Olof Johansson , Arnd Bergmann , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Matthias Brugger , Marc Zyngier Subject: linux-next: build failure after merge of the pm tree Message-ID: <20151101175718.130f33f2@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rafael, After merging the pm tree, today's linux-next build (arm multi_v7_defconfig) failed like this: arch/arm/mach-mediatek/mediatek.c: In function 'mediatek_timer_init': arch/arm/mach-mediatek/mediatek.c:43:2: error: implicit declaration of function 'clocksource_of_init' [-Werror=implicit-function-declaration] clocksource_of_init(); ^ Caused by commit 3722ed2380ad ("clocksource: cosmetic: Drop OF 'dependency' from symbols") interacting with commit 9821e545c5e0 ("ARM: mediatek: enable gpt6 on boot up to make arch timer working") from the arm-soc tree. I applied the following merge fix patch for today (someone should tell Linus when theese trees are merged): From: Stephen Rothwell Date: Sun, 1 Nov 2015 17:52:26 +1100 Subject: [PATCH] ARM: mediatek: fixup for clocksource_of_init API change Signed-off-by: Stephen Rothwell --- arch/arm/mach-mediatek/mediatek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-mediatek/mediatek.c b/arch/arm/mach-mediatek/mediatek.c index 19dc738c1abc..c88a47a3dc37 100644 --- a/arch/arm/mach-mediatek/mediatek.c +++ b/arch/arm/mach-mediatek/mediatek.c @@ -40,7 +40,7 @@ static void __init mediatek_timer_init(void) } of_clk_init(NULL); - clocksource_of_init(); + clocksource_probe(); }; static const char * const mediatek_board_dt_compat[] = { -- 2.6.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au