From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yuanhan Liu Subject: Re: [PATCH] ACPI: fix the wrong #ifdef for acpi_no_s4_hw_signature Date: Tue, 16 Oct 2012 13:17:18 +0800 Message-ID: <20121016051718.GG1965@yliu-dev.sh.intel.com> References: <1350360303-14883-1-git-send-email-yuanhan.liu@linux.intel.com> <20121016042713.GA21841@localhost> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mga03.intel.com ([143.182.124.21]:2169 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752100Ab2JPFRO (ORCPT ); Tue, 16 Oct 2012 01:17:14 -0400 Content-Disposition: inline In-Reply-To: <20121016042713.GA21841@localhost> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Fengguang Wu Cc: lenb@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org On Tue, Oct 16, 2012 at 12:27:13PM +0800, Fengguang Wu wrote: > The title could be made more descriptive: > > ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION Yes, much better. > > On Tue, Oct 16, 2012 at 12:05:03PM +0800, Yuanhan Liu wrote: > > acpi_no_s4_hw_signature is defined in #ifdef CONFIG_HIBERNATION block, > > but the current code put the declare in #ifdef CONFIG_PM_SLEEP block. > > And it's better to always include the original build error/warning > messages when fixing build problems. Got it. Will send out v2 soon. Thanks, Yuanhan Liu > > Otherwise looks good to me. > > Reviewed-by: Fengguang Wu > > > Signed-off-by: Yuanhan Liu > > --- > > 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