aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--VERSION2
-rw-r--r--hw/acpi/core.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/VERSION b/VERSION
index 127ee428b6..7ff039e8fc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.93
+2.5.94
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 7925a1a45b..6a2f452141 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);
}