2013-06-18 21:07:12

by Toshi Kani

Subject: [PATCH] ACPI: Remove the use of CONFIG_ACPI_HOTPLUG_MEMORY_MODULE

config ACPI_HOTPLUG_MEMORY has been changed to bool (y/n), and
its module option is no longer valid. So, remove the use of
CONFIG_ACPI_HOTPLUG_MEMORY_MODULE.

Signed-off-by: Toshi Kani <[email protected]>
---
include/linux/acpi.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 17b5b59..353ba25 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -352,8 +352,7 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,

/* Enable _OST when all relevant hotplug operations are enabled */
#if defined(CONFIG_ACPI_HOTPLUG_CPU) && \
- (defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \
- defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) && \
+ defined(CONFIG_ACPI_HOTPLUG_MEMORY) && \
defined(CONFIG_ACPI_CONTAINER)
#define ACPI_HOTPLUG_OST
#endif

2013-06-19 04:44:28

by Yasuaki Ishimatsu

Subject: Re: [PATCH] ACPI: Remove the use of CONFIG_ACPI_HOTPLUG_MEMORY_MODULE

2013/06/19 6:06, Toshi Kani wrote:
> config ACPI_HOTPLUG_MEMORY has been changed to bool (y/n), and
> its module option is no longer valid. So, remove the use of
> CONFIG_ACPI_HOTPLUG_MEMORY_MODULE.
>
> Signed-off-by: Toshi Kani <[email protected]>
> ---
> include/linux/acpi.h | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> index 17b5b59..353ba25 100644
> --- a/include/linux/acpi.h
> +++ b/include/linux/acpi.h
> @@ -352,8 +352,7 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,
>
> /* Enable _OST when all relevant hotplug operations are enabled */
> #if defined(CONFIG_ACPI_HOTPLUG_CPU) && \
> - (defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \
> - defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) && \
> + defined(CONFIG_ACPI_HOTPLUG_MEMORY) && \
> defined(CONFIG_ACPI_CONTAINER)
> #define ACPI_HOTPLUG_OST
> #endif
> --
Good catch!!

Acked-by: Yasuaki Ishimatsu <[email protected]>

Thanks,
Yasuaki Ishimatsu

> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>

2013-06-19 14:47:41

by Toshi Kani

Subject: Re: [PATCH] ACPI: Remove the use of CONFIG_ACPI_HOTPLUG_MEMORY_MODULE

On Wed, 2013-06-19 at 13:43 +0900, Yasuaki Ishimatsu wrote:
> 2013/06/19 6:06, Toshi Kani wrote:
> > config ACPI_HOTPLUG_MEMORY has been changed to bool (y/n), and
> > its module option is no longer valid. So, remove the use of
> > CONFIG_ACPI_HOTPLUG_MEMORY_MODULE.
> >
> > Signed-off-by: Toshi Kani <[email protected]>
> > ---
> > include/linux/acpi.h | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> > index 17b5b59..353ba25 100644
> > --- a/include/linux/acpi.h
> > +++ b/include/linux/acpi.h
> > @@ -352,8 +352,7 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,
> >
> > /* Enable _OST when all relevant hotplug operations are enabled */
> > #if defined(CONFIG_ACPI_HOTPLUG_CPU) && \
> > - (defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \
> > - defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) && \
> > + defined(CONFIG_ACPI_HOTPLUG_MEMORY) && \
> > defined(CONFIG_ACPI_CONTAINER)
> > #define ACPI_HOTPLUG_OST
> > #endif
> > --
> Good catch!!
>
> Acked-by: Yasuaki Ishimatsu <[email protected]>

Thanks Yasuaki!
-Toshi

2013-06-19 23:10:01

by Rafael J. Wysocki

Subject: Re: [PATCH] ACPI: Remove the use of CONFIG_ACPI_HOTPLUG_MEMORY_MODULE

On Wednesday, June 19, 2013 08:47:17 AM Toshi Kani wrote:
> On Wed, 2013-06-19 at 13:43 +0900, Yasuaki Ishimatsu wrote:
> > 2013/06/19 6:06, Toshi Kani wrote:
> > > config ACPI_HOTPLUG_MEMORY has been changed to bool (y/n), and
> > > its module option is no longer valid. So, remove the use of
> > > CONFIG_ACPI_HOTPLUG_MEMORY_MODULE.
> > >
> > > Signed-off-by: Toshi Kani <[email protected]>
> > > ---
> > > include/linux/acpi.h | 3 +--
> > > 1 file changed, 1 insertion(+), 2 deletions(-)
> > >
> > > diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> > > index 17b5b59..353ba25 100644
> > > --- a/include/linux/acpi.h
> > > +++ b/include/linux/acpi.h
> > > @@ -352,8 +352,7 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,
> > >
> > > /* Enable _OST when all relevant hotplug operations are enabled */
> > > #if defined(CONFIG_ACPI_HOTPLUG_CPU) && \
> > > - (defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \
> > > - defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) && \
> > > + defined(CONFIG_ACPI_HOTPLUG_MEMORY) && \
> > > defined(CONFIG_ACPI_CONTAINER)
> > > #define ACPI_HOTPLUG_OST
> > > #endif
> > > --
> > Good catch!!
> >
> > Acked-by: Yasuaki Ishimatsu <[email protected]>
>
> Thanks Yasuaki!

Queued up for 3.11.

Thanks,
Rafael


--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.