Stephen C. Tweedie
2005-Nov-28 19:55 UTC
[Xen-devel] [Patch] Fix broken ACPI in linux-2.6-xen and linux-2.6-merge
Hi all, I''ve been struggling with unbootable Xen kernels when using the 2.6.14 subarch versions of Xen, and have traced it down to non-functioning ACPI. This seems to be because of config changes with the Xen subarch move; the old #define CONFIG_XEN_X86 has become CONFIG_X86_XEN in the new trees, but drivers/acpi/table.c was still using the old symbol name. Simple patch attached, and my linux-2.6-xen builds now boot again. --Stephen # HG changeset patch # User sct@sct.boston.redhat.com # Node ID 5753c8372d613848cf8bba7d970cbf051dd16dad # Parent eacc66aa98c1e47e50b64309a9c7bfb08a221dab Fix acpi use of CONFIG_*X86* to match the config defines used with Xen subarch. diff -r eacc66aa98c1 -r 5753c8372d61 drivers/acpi/tables.c --- a/drivers/acpi/tables.c Mon Nov 28 14:28:32 2005 -0500 +++ b/drivers/acpi/tables.c Mon Nov 28 14:50:35 2005 -0500 @@ -572,7 +572,7 @@ * * result: sdt_entry[] is initialized */ -#if defined(CONFIG_XEN_X86) || defined(CONFIG_XEN_X86_64) +#if defined(CONFIG_X86_XEN) || defined(CONFIG_X86_64_XEN) #define acpi_rsdp_phys_to_va(rsdp_phys) (__fix_to_virt(FIX_ACPI_RSDP_PAGE) + \ (rsdp_phys & ~PAGE_MASK)) #else _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Christian Limpach
2005-Nov-28 23:47 UTC
Re: [Xen-devel] [Patch] Fix broken ACPI in linux-2.6-xen and linux-2.6-merge
On 11/28/05, Stephen C. Tweedie <sct@redhat.com> wrote:> I''ve been struggling with unbootable Xen kernels when using the 2.6.14 > subarch versions of Xen, and have traced it down to non-functioning > ACPI. This seems to be because of config changes with the Xen subarch > move; the old #define CONFIG_XEN_X86 has become CONFIG_X86_XEN in the > new trees, but drivers/acpi/table.c was still using the old symbol name. > Simple patch attached, and my linux-2.6-xen builds now boot again.Thanks, well spotted. I''ve applied your patch. christian _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel