| Message ID | 1371589605-15638-1-git-send-email-toshi.kani@hp.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
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 <toshi.kani@hp.com> > --- > 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 <isimatu.yasuaki@jp.fujitsu.com> Thanks, Yasuaki Ishimatsu > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 <toshi.kani@hp.com> > > --- > > 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 <isimatu.yasuaki@jp.fujitsu.com> Thanks Yasuaki! -Toshi -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 <toshi.kani@hp.com> > > > --- > > > 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 <isimatu.yasuaki@jp.fujitsu.com> > > Thanks Yasuaki! Queued up for 3.11. Thanks, Rafael
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
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 <toshi.kani@hp.com> --- include/linux/acpi.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html