* [PATCH v2] ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION
@ 2012-10-16 5:24 Yuanhan Liu
2012-10-16 6:24 ` Fengguang Wu
2012-10-24 22:12 ` Rafael J. Wysocki
0 siblings, 2 replies; 4+ messages in thread
From: Yuanhan Liu @ 2012-10-16 5:24 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, linux-kernel, fengguang.wu, Yuanhan Liu
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]
v2: take better title and add build error message suggested by Fengguang
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Fengguang Wu <fengguang.wu@intel.com>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION
2012-10-16 5:24 [PATCH v2] ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION Yuanhan Liu
@ 2012-10-16 6:24 ` Fengguang Wu
2012-10-16 7:21 ` Yuanhan Liu
2012-10-24 22:12 ` Rafael J. Wysocki
1 sibling, 1 reply; 4+ messages in thread
From: Fengguang Wu @ 2012-10-16 6:24 UTC (permalink / raw)
To: Yuanhan Liu; +Cc: lenb, linux-acpi, linux-kernel
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 <yuanhan.liu@linux.intel.com>
> Reviewed-by: Fengguang Wu <fengguang.wu@intel.com>
> ---
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION
2012-10-16 6:24 ` Fengguang Wu
@ 2012-10-16 7:21 ` Yuanhan Liu
0 siblings, 0 replies; 4+ messages in thread
From: Yuanhan Liu @ 2012-10-16 7:21 UTC (permalink / raw)
To: Fengguang Wu; +Cc: lenb, linux-acpi, linux-kernel
On Tue, Oct 16, 2012 at 02:24:53PM +0800, Fengguang Wu wrote:
> 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:
Actually, there are more erros besides the followling one on !CONFIG_PM_SLEEP.
This patch just fix one obvious one: the logical is wrong.
Thanks,
Yuanhan Liu
>
> 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 <yuanhan.liu@linux.intel.com>
> > Reviewed-by: Fengguang Wu <fengguang.wu@intel.com>
> > ---
> > 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION
2012-10-16 5:24 [PATCH v2] ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION Yuanhan Liu
2012-10-16 6:24 ` Fengguang Wu
@ 2012-10-24 22:12 ` Rafael J. Wysocki
1 sibling, 0 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2012-10-24 22:12 UTC (permalink / raw)
To: Yuanhan Liu; +Cc: lenb, linux-acpi, linux-kernel, fengguang.wu
On Tuesday 16 of October 2012 13:24:12 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]
>
> v2: take better title and add build error message suggested by Fengguang
>
> Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
> Reviewed-by: Fengguang Wu <fengguang.wu@intel.com>
Applied to linux-pm.git/acpi-next as v3.8 material.
Thanks,
Rafael
> ---
> 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 */
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-10-24 22:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-16 5:24 [PATCH v2] ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION Yuanhan Liu
2012-10-16 6:24 ` Fengguang Wu
2012-10-16 7:21 ` Yuanhan Liu
2012-10-24 22:12 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).