From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754040Ab2JPGZO (ORCPT ); Tue, 16 Oct 2012 02:25:14 -0400 Received: from mga11.intel.com ([192.55.52.93]:38958 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752794Ab2JPGZM (ORCPT ); Tue, 16 Oct 2012 02:25:12 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,593,1344236400"; d="scan'208";a="235566181" Date: Tue, 16 Oct 2012 14:24:53 +0800 From: Fengguang Wu To: Yuanhan Liu Cc: lenb@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION Message-ID: <20121016062453.GA1505@localhost> References: <1350365052-27304-1-git-send-email-yuanhan.liu@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1350365052-27304-1-git-send-email-yuanhan.liu@linux.intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Oct 16, 2012 at 01:24:12PM +0800, Yuanhan Liu wrote: > acpi_no_s4_hw_signature is defined in #ifdef CONFIG_HIBERNATION block, > but the current code put the declaration in #ifdef CONFIG_PM_SLEEP block. > > I happened to meet this issue when I turned off PM_SLEEP config manually: > arch/x86/kernel/acpi/sleep.c:100:4: error: implicit declaration of function ‘acpi_no_s4_hw_signature’ [-Werror=implicit-function-declaration] This should be more clear: Fix build error on !CONFIG_PM_SLEEP: arch/x86/kernel/acpi/sleep.c:100:4: error: implicit declaration of function ‘acpi_no_s4_hw_signature’ The root cause is, acpi_no_s4_hw_signature() is defined in #ifdef CONFIG_HIBERNATION block, but the current code put the declaration in #ifdef CONFIG_PM_SLEEP block. Thanks, Fengguang > v2: take better title and add build error message suggested by Fengguang > > Signed-off-by: Yuanhan Liu > Reviewed-by: Fengguang Wu > --- > include/linux/acpi.h | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 90be989..a468429 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -257,8 +257,11 @@ int acpi_check_region(resource_size_t start, resource_size_t n, > > int acpi_resources_are_enforced(void); > > -#ifdef CONFIG_PM_SLEEP > +#ifdef CONFIG_HIBERNATION > void __init acpi_no_s4_hw_signature(void); > +#endif > + > +#ifdef CONFIG_PM_SLEEP > void __init acpi_old_suspend_ordering(void); > void __init acpi_nvs_nosave(void); > #endif /* CONFIG_PM_SLEEP */ > -- > 1.7.7.6