summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2016-04-15 08:43:29 +0200
committerTimothy Pearson <tpearson@raptorengineering.com>2019-11-29 20:03:50 -0600
commitdac0dc12bd446f8cbbd720c288fa192d01305492 (patch)
tree914f744f75e35321b595a953c53f692f7eaccb20
parentf34dc2b7e1070c9254a351a489f7e72504389378 (diff)
downloadhqemu-dac0dc12bd446f8cbbd720c288fa192d01305492.zip
hqemu-dac0dc12bd446f8cbbd720c288fa192d01305492.tar.gz
Revert "acpi: mark PMTIMER as unlocked"
This reverts commit 7070e085d490c396f9237c8f10bf8b6e69cd0066. Commit message claims locking is not needed, but that appears to not be true, seabios ehci driver runs into timekeeping problems with this, see https://bugzilla.redhat.com/show_bug.cgi?id=1322713 Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 1460702609-25971-1-git-send-email-kraxel@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--hw/acpi/core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 7925a1a..6a2f452 100644
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -536,7 +536,6 @@ void acpi_pm_tmr_init(ACPIREGS *ar, acpi_update_sci_fn update_sci,
ar->tmr.timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, acpi_pm_tmr_timer, ar);
memory_region_init_io(&ar->tmr.io, memory_region_owner(parent),
&acpi_pm_tmr_ops, ar, "acpi-tmr", 4);
- memory_region_clear_global_locking(&ar->tmr.io);
memory_region_add_subregion(parent, 8, &ar->tmr.io);
}
OpenPOWER on IntegriCloud