Merge "Allow restart_syscall" am: 1b3350e4ca am: 5b0dd3cbe3 am: 90d299f9f0
am: 6aa2d6cbf8

Change-Id: Icb86f96eb9b8ca632217dc9f8c7a77c4bede6484
diff --git a/init/seccomp.cpp b/init/seccomp.cpp
index d9f2f79..b7744b6 100644
--- a/init/seccomp.cpp
+++ b/init/seccomp.cpp
@@ -170,6 +170,9 @@
     // Needed for trusty
     AllowSyscall(f, __NR_syncfs);
 
+    // Needed for kernel to restart syscalls
+    AllowSyscall(f, __NR_restart_syscall);
+
      // arm64-only filter - autogenerated from bionic syscall usage
     for (size_t i = 0; i < arm64_filter_size; ++i)
         f.push_back(arm64_filter[i]);
@@ -201,6 +204,9 @@
     // Syscalls needed to run GFXBenchmark
     AllowSyscall(f, 190); // __NR_vfork
 
+    // Needed for kernel to restart syscalls
+    AllowSyscall(f, 0);  // __NR_restart_syscall
+
     // arm32-on-arm64 only filter - autogenerated from bionic syscall usage
     for (size_t i = 0; i < arm_filter_size; ++i)
         f.push_back(arm_filter[i]);