Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b47eef8d authored by Peter Collingbourne's avatar Peter Collingbourne
Browse files

resolve merge conflicts of 76f6ed07 to sc-dev

Bug: 185658438
Change-Id: I0212a32e2e88408337cff6c0aa70d5369a805310
parents e72957e0 76f6ed07
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ ftruncate: 1
# on ARM is statically loaded at 0xffff 0000. See
# http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0211h/Babfeega.html
# for more details.
mremap: arg3 == 3
mremap: arg3 == 3 || arg3 == MREMAP_MAYMOVE
munmap: 1
prctl: 1
writev: 1