diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-06-01 16:43:52 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-06-01 16:43:52 +0100 |
| commit | 0ea8826c2e1092b38e3c62e82cff102a80cbd795 (patch) | |
| tree | edf3972f50930bbfc6a6e405ecce87e7f40bd0aa /tools | |
| parent | 2e65685119c40ab1eebf4d139e6c7d00cf49dcc8 (diff) | |
| download | xen-0ea8826c2e1092b38e3c62e82cff102a80cbd795.tar.gz xen-0ea8826c2e1092b38e3c62e82cff102a80cbd795.tar.bz2 xen-0ea8826c2e1092b38e3c62e82cff102a80cbd795.zip | |
hvmloader: call SMP setup from common code again.
Previous refactoring was premature.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/firmware/hvmloader/config.h | 2 | ||||
| -rw-r--r-- | tools/firmware/hvmloader/hvmloader.c | 3 | ||||
| -rw-r--r-- | tools/firmware/hvmloader/rombios.c | 2 | ||||
| -rw-r--r-- | tools/firmware/hvmloader/seabios.c | 2 |
4 files changed, 1 insertions, 8 deletions
diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h index 44b664229f..62dcc22ea5 100644 --- a/tools/firmware/hvmloader/config.h +++ b/tools/firmware/hvmloader/config.h @@ -26,8 +26,6 @@ struct bios_config { /* ACPI tables */ unsigned int acpi_start; - void (*smp_setup)(void); - uint32_t (*bios_high_setup)(void); void (*bios_info_setup)(uint32_t); diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index baa2f3927f..751c682339 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -403,8 +403,7 @@ int main(void) apic_setup(); pci_setup(); - if (bios->smp_setup) - bios->smp_setup(); + smp_initialise(); perform_tests(); diff --git a/tools/firmware/hvmloader/rombios.c b/tools/firmware/hvmloader/rombios.c index 40b3134125..20aa8ed221 100644 --- a/tools/firmware/hvmloader/rombios.c +++ b/tools/firmware/hvmloader/rombios.c @@ -151,8 +151,6 @@ struct bios_config rombios_config = { .acpi_start = ACPI_PHYSICAL_ADDRESS, - .smp_setup = smp_initialise, - .bios_high_setup = rombios_highbios_setup, .bios_info_setup = rombios_setup_bios_info, diff --git a/tools/firmware/hvmloader/seabios.c b/tools/firmware/hvmloader/seabios.c index 1bad44f192..4ea630bdf5 100644 --- a/tools/firmware/hvmloader/seabios.c +++ b/tools/firmware/hvmloader/seabios.c @@ -50,8 +50,6 @@ struct bios_config seabios_config = { .bios_info_setup = NULL, - .smp_setup = NULL, - .vm86_setup = NULL, .e820_setup = NULL, |