aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2013-02-10 01:15:01 +0000
committerKevin O'Connor <kevin@koconnor.net>2013-02-12 21:14:49 -0500
commit31fe26e6db338e6d6b01e8f9d49eb1b19aaf5bbf (patch)
tree7f9c813905694727ebb0e3d3d62f8596a5c05fd4
parent473013a8219176a39cbdabb5caabaf341d8ce44b (diff)
downloadseabios-31fe26e6db338e6d6b01e8f9d49eb1b19aaf5bbf.tar.gz
Move find_pmtimer() to ACPI table setup where it logically belongs
We don't have the ordering dependency with timer_setup() any more. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--src/csm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/csm.c b/src/csm.c
index 057e529..40fbf5d 100644
--- a/src/csm.c
+++ b/src/csm.c
@@ -134,6 +134,8 @@ handle_csm_0002(struct bregs *regs)
if (csm_rsdp.signature == RSDP_SIGNATURE) {
RsdpAddr = &csm_rsdp;
dprintf(3, "CSM ACPI RSDP at %p\n", RsdpAddr);
+
+ find_pmtimer();
}
// SMBIOS table needs to be copied into the f-seg
@@ -151,8 +153,6 @@ handle_csm_0002(struct bregs *regs)
bda->hdcount = 0;
timer_setup();
- // This has to set cpu_khz *after* calibrate_tsc() does it
- find_pmtimer();
device_hardware_setup();
wait_threads();
interactive_bootmenu();