From ee8eea93307a3d5da8d1be64c102dce8eb1adb6a Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Wed, 6 Feb 2013 11:32:11 +0100 Subject: [PATCH] nova: fix lock guard usage in cap selector Issue #549 --- base-nova/src/base/env/cap_sel_alloc.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base-nova/src/base/env/cap_sel_alloc.cc b/base-nova/src/base/env/cap_sel_alloc.cc index 0d5f822c3..31905774b 100644 --- a/base-nova/src/base/env/cap_sel_alloc.cc +++ b/base-nova/src/base/env/cap_sel_alloc.cc @@ -27,23 +27,23 @@ using namespace Genode; /** * Return lock used to protect capability selector allocations */ -static Genode::Lock *alloc_lock() +static Genode::Lock &alloc_lock() { static Genode::Lock alloc_lock_inst; - return &alloc_lock_inst; + return alloc_lock_inst; } addr_t Cap_selector_allocator::alloc(size_t num_caps_log2) { - Lock::Guard(alloc_lock()); + Lock::Guard guard(alloc_lock()); return Bit_allocator::alloc(num_caps_log2); } void Cap_selector_allocator::free(addr_t cap, size_t num_caps_log2) { - Lock::Guard(alloc_lock()); + Lock::Guard guard(alloc_lock()); Bit_allocator::free(cap, num_caps_log2); }