From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751700Ab3ASNj0 (ORCPT ); Sat, 19 Jan 2013 08:39:26 -0500 Received: from hydra.sisk.pl ([212.160.235.94]:46773 "EHLO hydra.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751157Ab3ASNjY (ORCPT ); Sat, 19 Jan 2013 08:39:24 -0500 From: "Rafael J. Wysocki" To: Randy Dunlap Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: Tree for Jan 18 (acpi) Date: Sat, 19 Jan 2013 14:45:19 +0100 Message-ID: <4935167.QM3InZsTWy@vostro.rjw.lan> User-Agent: KMail/4.9.5 (Linux/3.8.0-rc4; KDE/4.9.5; x86_64; ; ) In-Reply-To: <50F9F9FC.1060001@infradead.org> References: <20130118153707.0909fb9039e411acc1674c32@canb.auug.org.au> <50F9F9FC.1060001@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Friday, January 18, 2013 05:42:20 PM Randy Dunlap wrote: > On 01/17/13 20:37, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20130117: > > > > > on x86_64: > > CC drivers/acpi/device_pm.o > drivers/acpi/device_pm.c:778:5: error: redefinition of 'acpi_dev_suspend_late' > In file included from include/acpi/acpi_drivers.h:29:0, > from drivers/acpi/device_pm.c:33: > include/linux/acpi.h:526:19: note: previous definition of 'acpi_dev_suspend_late' was here > drivers/acpi/device_pm.c:810:5: error: redefinition of 'acpi_dev_resume_early' > In file included from include/acpi/acpi_drivers.h:29:0, > from drivers/acpi/device_pm.c:33: > include/linux/acpi.h:527:19: note: previous definition of 'acpi_dev_resume_early' was here > drivers/acpi/device_pm.c:828:5: error: redefinition of 'acpi_subsys_prepare' > In file included from include/acpi/acpi_drivers.h:29:0, > from drivers/acpi/device_pm.c:33: > include/linux/acpi.h:528:19: note: previous definition of 'acpi_subsys_prepare' was here > drivers/acpi/device_pm.c:846:5: error: redefinition of 'acpi_subsys_suspend_late' > In file included from include/acpi/acpi_drivers.h:29:0, > from drivers/acpi/device_pm.c:33: > include/linux/acpi.h:529:19: note: previous definition of 'acpi_subsys_suspend_late' was here > drivers/acpi/device_pm.c:861:5: error: redefinition of 'acpi_subsys_resume_early' > In file included from include/acpi/acpi_drivers.h:29:0, > from drivers/acpi/device_pm.c:33: > include/linux/acpi.h:530:19: note: previous definition of 'acpi_subsys_resume_early' was here > make[3]: *** [drivers/acpi/device_pm.o] Error 1 > > > > > Full randconfig file is attached. Thanks, I'll take it for inclusion into the build testing framework. The appended patch fixes the problem for me. Thanks, Rafael --- From: Rafael J. Wysocki Subject: ACPI / PM: Fix build for unusual combination of Kconfig options CONFIG_PM_SLEEP may be set even if CONFIG_ACPI_SLEEP is unset, although that is unusual. For this reason, make the headers of functions built for both CONFIG_ACPI and CONFIG_PM_SLEEP set simultaneously depend on that combination of Kconfig options instead of CONFIG_ACPI_SLEEP. This fixes a build problem reported by Randy Dunlap. Signed-off-by: Rafael J. Wysocki --- include/linux/acpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-pm/include/linux/acpi.h =================================================================== --- linux-pm.orig/include/linux/acpi.h +++ linux-pm/include/linux/acpi.h @@ -511,7 +511,7 @@ static inline int acpi_subsys_runtime_su static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; } #endif -#ifdef CONFIG_ACPI_SLEEP +#if defined(CONFIG_ACPI) && defined(CONFIG_PM_SLEEP) int acpi_dev_suspend_late(struct device *dev); int acpi_dev_resume_early(struct device *dev); int acpi_subsys_prepare(struct device *dev); -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.