# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1630105191 -7200
# Node ID 20ac1c62126c4b56345366c6a5de082c79419576
# Parent  78a45e9e4a55144016c5358a4d14a66d4c8c3bfb
Removed non-functioning workarounds, reserving the default branch for use with
the current L4Re development distribution.

diff -r 78a45e9e4a55 -r 20ac1c62126c libipc/lib/src/mem_ipc.c
--- a/libipc/lib/src/mem_ipc.c	Sat Aug 28 00:28:46 2021 +0200
+++ b/libipc/lib/src/mem_ipc.c	Sat Aug 28 00:59:51 2021 +0200
@@ -71,12 +71,6 @@
   return l4re_ma_alloc_align(size, cap, flags, align);
 }
 
-/* Work around API change. */
-
-#ifndef L4RE_RM_SEARCH_ADDR
-#define L4RE_RM_SEARCH_ADDR L4RE_RM_F_SEARCH_ADDR | L4RE_RM_F_RW
-#endif
-
 /* Attach a dataspace region. Similar to l4re_rm_attach. */
 
 long ipc_attach_dataspace(l4re_ds_t ds, unsigned long size, void **addr)
@@ -87,7 +81,11 @@
   if (err)
     return err;
 
-  err = l4re_rm_attach(addr, size, L4RE_RM_SEARCH_ADDR, ds, 0, L4_PAGESHIFT);
+  /* The region manager has changed, requiring rights flags for successful use
+     of the mapped region. */
+
+  err = l4re_rm_attach(addr, size, L4RE_RM_F_SEARCH_ADDR | L4RE_RM_F_RW, ds, 0,
+                       L4_PAGESHIFT);
 
   ipc_semaphore_up(ipc_mem_semaphore);
 
diff -r 78a45e9e4a55 -r 20ac1c62126c libmem/include/mem/flexpage.h
--- a/libmem/include/mem/flexpage.h	Sat Aug 28 00:28:46 2021 +0200
+++ b/libmem/include/mem/flexpage.h	Sat Aug 28 00:59:51 2021 +0200
@@ -29,13 +29,8 @@
 
 /* Work around API change. */
 
-#ifndef L4RE_DS_MAP_FLAG_RO
 #define L4RE_DS_MAP_FLAG_RO L4RE_DS_F_R
-#endif
-
-#ifndef L4RE_DS_MAP_FLAG_RW
 #define L4RE_DS_MAP_FLAG_RW L4RE_DS_F_RW
-#endif