2012-10-16 04:04:59

by Yuanhan Liu

Subject: [PATCH] ACPI: fix the wrong #ifdef for acpi_no_s4_hw_signature

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.

Signed-off-by: Yuanhan Liu <[email protected]>
---
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

2012-10-16 04:27:17

by Fengguang Wu

Subject: Re: [PATCH] ACPI: fix the wrong #ifdef for acpi_no_s4_hw_signature

The title could be made more descriptive:

ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION

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.

Otherwise looks good to me.

Reviewed-by: Fengguang Wu <[email protected]>

> Signed-off-by: Yuanhan Liu <[email protected]>
> ---
> 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

2012-10-16 05:17:15

by Yuanhan Liu

Subject: Re: [PATCH] ACPI: fix the wrong #ifdef for acpi_no_s4_hw_signature

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 <[email protected]>
>
> > Signed-off-by: Yuanhan Liu <[email protected]>
> > ---
> > 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