From 125d274bc7cfeb3bd9b4fe07f16e8ad84d60fc0a Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Mon, 20 Aug 2012 12:03:31 +0200 Subject: [PATCH] NOVA: fix locking in vancouver Reported by @parthy. --- ports/src/vancouver/main.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/src/vancouver/main.cc b/ports/src/vancouver/main.cc index 5a58d6ace5..1a91ad7ca3 100644 --- a/ports/src/vancouver/main.cc +++ b/ports/src/vancouver/main.cc @@ -742,11 +742,10 @@ class Machine : public StaticReceiver { Logging::printf("OP_VCPU_BLOCK\n"); - global_lock.lock(); - Logging::printf("going to block\n"); + global_lock.unlock(); bool res = (Nova::sm_ctrl(msg.value, Nova::SEMAPHORE_DOWN) == 0); Logging::printf("woke up from vcpu sem, block on global_lock\n"); - global_lock.unlock(); + global_lock.lock(); return res; }