From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753377AbbJSItA (ORCPT ); Mon, 19 Oct 2015 04:49:00 -0400 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:34363 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753122AbbJSIs4 (ORCPT ); Mon, 19 Oct 2015 04:48:56 -0400 Date: Mon, 19 Oct 2015 10:48:53 +0200 From: Pavel Machek To: Geert Uytterhoeven Cc: "Rafael J. Wysocki" , Greg Ungerer , linux-pm@vger.kernel.org, linux-m68kvger.kernel.org@ramsan.of.borg, linux-kernel@vger.kernel.org Subject: Re: [PATCH] PM / clk: Fix broken build due to non-matching code and header #ifdefs Message-ID: <20151019084853.GA12164@amd> References: <1445242567-24032-1-git-send-email-geert@linux-m68k.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1445242567-24032-1-git-send-email-geert@linux-m68k.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon 2015-10-19 10:16:07, Geert Uytterhoeven wrote: > If an architecture's main Kconfig file doesn't include > kernel/power/Kconfig, but CONFIG_PM=y and HAVE_CLK=y (e.g. m68knommu > allmodconfig): > > drivers/base/power/clock_ops.c: In function ‘__pm_clk_add’: > drivers/base/power/clock_ops.c:106: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’ > drivers/base/power/clock_ops.c: At top level: > drivers/base/power/clock_ops.c:120: error: redefinition of ‘pm_clk_add’ > include/linux/pm_clock.h:64: error: previous definition of ‘pm_clk_add’ was here > drivers/base/power/clock_ops.c:135: error: redefinition of ‘pm_clk_add_clk’ > include/linux/pm_clock.h:69: error: previous definition of ‘pm_clk_add_clk’ was here > drivers/base/power/clock_ops.c:171: error: redefinition of ‘pm_clk_remove’ > include/linux/pm_clock.h:73: error: previous definition of ‘pm_clk_remove’ was here > drivers/base/power/clock_ops.c: In function ‘pm_clk_remove’: > drivers/base/power/clock_ops.c:180: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’ > drivers/base/power/clock_ops.c:180: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’ > drivers/base/power/clock_ops.c: At top level: > drivers/base/power/clock_ops.c:207: error: redefinition of ‘pm_clk_init’ > include/linux/pm_clock.h:54: error: previous definition of ‘pm_clk_init’ was here > drivers/base/power/clock_ops.c: In function ‘pm_clk_init’: > drivers/base/power/clock_ops.c:210: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’ > drivers/base/power/clock_ops.c: At top level: > drivers/base/power/clock_ops.c:221: error: redefinition of ‘pm_clk_create’ > include/linux/pm_clock.h:57: error: previous definition of ‘pm_clk_create’ was here > drivers/base/power/clock_ops.c:234: error: redefinition of ‘pm_clk_destroy’ > include/linux/pm_clock.h:61: error: previous definition of ‘pm_clk_destroy’ was here > drivers/base/power/clock_ops.c: In function ‘pm_clk_destroy’: > drivers/base/power/clock_ops.c:246: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’ > drivers/base/power/clock_ops.c:246: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’ > drivers/base/power/clock_ops.c: At top level: > drivers/base/power/clock_ops.c:263: error: expected identifier or ‘(’ before ‘void’ > drivers/base/power/clock_ops.c:263: error: expected ‘)’ before numeric constant > drivers/base/power/clock_ops.c:293: error: expected identifier or ‘(’ before ‘void’ > drivers/base/power/clock_ops.c:293: error: expected ‘)’ before numeric constant > drivers/base/power/clock_ops.c: In function ‘pm_clk_runtime_suspend’: > drivers/base/power/clock_ops.c:384: error: called object ‘0u’ is not a function > drivers/base/power/clock_ops.c: In function ‘pm_clk_runtime_resume’: > drivers/base/power/clock_ops.c:400: error: called object ‘0u’ is not a function > > This happens because: > - drivers/base/power/clock_ops.c depends on CONFIG_HAVE_CLK, > - the failing code inside clock_ops.c additionally depends on > CONFIG_PM, > - the forward declarations and other definitions in > depend on CONFIG_PM_CLK, > - CONFIG_PM_CLK is defined as PM && HAVE_CLK in kernel/power/Kconfig, > but it is not included on all architectures. > > Fix this by protecting the failing code inside clock_ops.c by > CONFIG_PM_CLK instead of CONFIG_PM, so it matches . > > Signed-off-by: Geert Uytterhoeven Acked-by: Pavel Machek -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html