Chuck Ebbert wrote:
> From: Chuck Ebbert
>
> xen: make CONFIG_XEN_SAVE_RESTORE depend on CONFIG_XEN
>
> Xen options need to depend on XEN.
> Also, add newline at end of file.
>
> Without this patch you need to disable CONFIG_PM in order to
> disable CPU hotplugging.
>
> Signed-off-by: Chuck Ebbert
>
Acked-by: Jeremy Fitzhardinge

> ---
>
> Index: linux-2.6.26.noarch/arch/x86/xen/Kconfig
> ================================================== =================
> --- linux-2.6.26.noarch.orig/arch/x86/xen/Kconfig
> +++ linux-2.6.26.noarch/arch/x86/xen/Kconfig
> @@ -26,5 +26,5 @@ config XEN_MAX_DOMAIN_MEMORY
>
> config XEN_SAVE_RESTORE
> bool
> - depends on PM
> - default y
> \ No newline at end of file
> + depends on XEN && PM
> + default y
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

* Jeremy Fitzhardinge wrote:

> Chuck Ebbert wrote:
> > From: Chuck Ebbert
> >
> > xen: make CONFIG_XEN_SAVE_RESTORE depend on CONFIG_XEN
> >
> > Xen options need to depend on XEN.
> > Also, add newline at end of file.
> >
> > Without this patch you need to disable CONFIG_PM in order to
> > disable CPU hotplugging.
> >
> > Signed-off-by: Chuck Ebbert
> >
> Acked-by: Jeremy Fitzhardinge

applied to tip/x86/xen, thanks! (hand-applied it as this portion already
changed relative to mainline)

Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/