From 31fe26e6db338e6d6b01e8f9d49eb1b19aaf5bbf Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 10 Feb 2013 01:15:01 +0000 Subject: [PATCH] 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 --- src/csm.c | 4 ++-- 1 file 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(); -- 2.39.5