update

[l4.git] / l4 / pkg / l4re / include / impl / rm_impl.h

diff --git a/l4/pkg/l4re/include/impl/rm_impl.h b/l4/pkg/l4re/include/impl/rm_impl.h
index b339444448a536449e23f1dca510e25555dd3484..9e8ab9111ba777e9544052512a184e5d74cecdcc 100644 (file)
--- a/l4/pkg/l4re/include/impl/rm_impl.h
+++ b/l4/pkg/l4re/include/impl/rm_impl.h
@@ -107,9 +107,31 @@ Rm::_detach(l4_addr_t addr, unsigned long size, L4::Cap<Dataspace> *mem,
   if (!task.is_valid())
     return err;
 
-  for (unsigned long p = 0; p < rsize; p += L4_PAGESIZE)
+  rsize = l4_round_page(rsize);
+  unsigned order = L4_LOG2_PAGESIZE;
+  unsigned long sz = (1UL << order);
+  for (unsigned long p = start; rsize; p += sz, rsize -= sz)
     {
-      task->unmap(l4_fpage(start + p, L4_LOG2_PAGESIZE, L4_FPAGE_RWX),
+      while (sz > rsize)
+       {
+         --order;
+         sz >>= 1;
+       }
+
+      for (;;)
+       {
+         unsigned long m = sz << 1;
+         if (m > rsize)
+           break;
+
+         if (p & (m - 1))
+           break;
+
+         ++order;
+         sz <<= 1;
+       }
+
+      task->unmap(l4_fpage(p, order, L4_FPAGE_RWX),
                   L4_FP_ALL_SPACES);
     }