Update

[l4.git] / l4 / pkg / l4re-core / l4re / util / include / region_mapping_svr

diff --git a/l4/pkg/l4re/util/include/region_mapping_svr b/l4/pkg/l4re-core/l4re/util/include/region_mapping_svr
similarity index 96%
rename from l4/pkg/l4re/util/include/region_mapping_svr
rename to l4/pkg/l4re-core/l4re/util/include/region_mapping_svr
index 75e4313d9b754f27fdf0f0fde6bd782407b57486..f6f25f024a41f50caa9f3d8618fca95cf0044171 100644 (file)
--- a/l4/pkg/l4re/util/include/region_mapping_svr
+++ b/l4/pkg/l4re-core/l4re/util/include/region_mapping_svr
@@ -31,8 +31,8 @@
 
 namespace L4Re { namespace Util {
 
-template<typename Rm_server, typename RM, typename IOS>
-int region_map_server(RM *rm, IOS &ios)
+template<typename Rm_server, typename SVR_DATA, typename RM, typename IOS>
+int region_map_server(SVR_DATA *sdata, RM *rm, IOS &ios)
 {
   L4::Opcode op;
   ios >> op;
@@ -54,7 +54,7 @@ int region_map_server(RM *rm, IOS &ios)
              {
                ios >> client_cap_idx >> ds_cap;
 
-               if (int r = Rm_server::validate_ds(ds_cap, flags, &ds))
+               if (int r = Rm_server::validate_ds(sdata, ds_cap, flags, &ds))
                  return r;
              }
 
@@ -211,7 +211,7 @@ int region_pf_handler(RM *rm, IOS &ios)
   ios >> addr >> pc >> sp;
   Dbg(Dbg::Server).printf("page fault: %lx pc=%lx\n", addr, pc);
 
-  register unsigned writable = addr & 2;
+  unsigned writable = addr & 2;
   addr = addr & ~3UL;
 
   typename RM::Node n = rm->find(addr);