update

[l4.git] / kernel / fiasco / src / kern / ux / mem_space-ux.cpp

diff --git a/kernel/fiasco/src/kern/ux/mem_space-ux.cpp b/kernel/fiasco/src/kern/ux/mem_space-ux.cpp
index 55d34bfbae7db930102b34835b3664b3724b3b34..6f4cccaf4b808d6460eccbe245f489bf7821896d 100644 (file)
--- a/kernel/fiasco/src/kern/ux/mem_space-ux.cpp
+++ b/kernel/fiasco/src/kern/ux/mem_space-ux.cpp
@@ -85,7 +85,7 @@ IMPLEMENT inline NEEDS [<asm/unistd.h>, <sys/mman.h>, "boot_info.h",
 void
 Mem_space::page_map(Address phys, Address virt, Address size, unsigned attr)
 {
-  Lock_guard<Cpu_lock> guard(&cpu_lock);
+  auto guard = lock_guard(cpu_lock);
 
   Mword *trampoline = (Mword *)Mem_layout::kernel_trampoline_page;
 
@@ -111,7 +111,7 @@ IMPLEMENT inline NEEDS [<asm/unistd.h>, "cpu_lock.h", "lock_guard.h",
 void
 Mem_space::page_unmap(Address virt, Address size)
 {
-  Lock_guard<Cpu_lock> guard(&cpu_lock);
+  auto guard = lock_guard(cpu_lock);
 
   Trampoline::syscall(pid(), __NR_munmap, virt, size);
 }
@@ -121,7 +121,7 @@ IMPLEMENT inline NEEDS [<asm/unistd.h>, "cpu_lock.h", "lock_guard.h",
 void
 Mem_space::page_protect(Address virt, Address size, unsigned attr)
 {
-  Lock_guard<Cpu_lock> guard(&cpu_lock);
+  auto guard = lock_guard(cpu_lock);
 
   Trampoline::syscall(pid(), __NR_mprotect, virt, size,
                       PROT_READ | (attr & Page_writable ? PROT_WRITE : 0));
@@ -191,7 +191,7 @@ Mem_space::peek_user(T const *addr)
   if (((Address)addr                   & Config::PAGE_MASK) ==
      (((Address)addr + sizeof (T) - 1) & Config::PAGE_MASK))
     {
-      Lock_guard<Cpu_lock> guard(&cpu_lock);
+      auto guard = lock_guard(cpu_lock);
       value = *user_to_kernel(addr, false);
     }
   else
@@ -209,7 +209,7 @@ Mem_space::poke_user(T *addr, T value)
   if (((Address)addr                   & Config::PAGE_MASK) ==
      (((Address)addr + sizeof (T) - 1) & Config::PAGE_MASK))
     {
-      Lock_guard<Cpu_lock> guard(&cpu_lock);
+      auto guard = lock_guard(cpu_lock);
       *user_to_kernel(addr, true) = value;
     }
   else
@@ -221,7 +221,7 @@ template< typename T >
 void
 Mem_space::copy_from_user(T *kdst, T const *usrc, size_t n)
 {
-  Lock_guard<Cpu_lock> guard(&cpu_lock);
+  auto guard = lock_guard(cpu_lock);
 
   char *ptr = (char *)usrc;
   char *dst = (char *)kdst;
@@ -244,7 +244,7 @@ template< typename T >
 void
 Mem_space::copy_to_user(T *udst, T const *ksrc, size_t n)
 {
-  Lock_guard<Cpu_lock> guard(&cpu_lock);
+  auto guard = lock_guard(cpu_lock);
 
   char *ptr = (char *)udst;
   char *src = (char *)ksrc;