[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] hvmloader: call SMP setup from common code again.
# HG changeset patch # User Ian Campbell <ian.campbell@xxxxxxxxxx> # Date 1306943032 -3600 # Node ID a5531244a818c36199f195434baf3d743ef682dd # Parent c47480f718c85bfd19c7d43e162a899584cc098c hvmloader: call SMP setup from common code again. Previous refactoring was premature. Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx> --- diff -r c47480f718c8 -r a5531244a818 tools/firmware/hvmloader/config.h --- a/tools/firmware/hvmloader/config.h Wed Jun 01 16:43:29 2011 +0100 +++ b/tools/firmware/hvmloader/config.h Wed Jun 01 16:43:52 2011 +0100 @@ -26,8 +26,6 @@ /* ACPI tables */ unsigned int acpi_start; - void (*smp_setup)(void); - uint32_t (*bios_high_setup)(void); void (*bios_info_setup)(uint32_t); diff -r c47480f718c8 -r a5531244a818 tools/firmware/hvmloader/hvmloader.c --- a/tools/firmware/hvmloader/hvmloader.c Wed Jun 01 16:43:29 2011 +0100 +++ b/tools/firmware/hvmloader/hvmloader.c Wed Jun 01 16:43:52 2011 +0100 @@ -403,8 +403,7 @@ apic_setup(); pci_setup(); - if (bios->smp_setup) - bios->smp_setup(); + smp_initialise(); perform_tests(); diff -r c47480f718c8 -r a5531244a818 tools/firmware/hvmloader/rombios.c --- a/tools/firmware/hvmloader/rombios.c Wed Jun 01 16:43:29 2011 +0100 +++ b/tools/firmware/hvmloader/rombios.c Wed Jun 01 16:43:52 2011 +0100 @@ -151,8 +151,6 @@ .acpi_start = ACPI_PHYSICAL_ADDRESS, - .smp_setup = smp_initialise, - .bios_high_setup = rombios_highbios_setup, .bios_info_setup = rombios_setup_bios_info, diff -r c47480f718c8 -r a5531244a818 tools/firmware/hvmloader/seabios.c --- a/tools/firmware/hvmloader/seabios.c Wed Jun 01 16:43:29 2011 +0100 +++ b/tools/firmware/hvmloader/seabios.c Wed Jun 01 16:43:52 2011 +0100 @@ -50,8 +50,6 @@ .bios_info_setup = NULL, - .smp_setup = NULL, - .vm86_setup = NULL, .e820_setup = NULL, _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |