diff --git a/kernel/syscall.c b/kernel/syscall.c
index a932215b..16d81989 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -3081,12 +3081,8 @@ SYSCALL_DECLARE(setpgid)
 
 SYSCALL_DECLARE(set_robust_list)
 {
-#ifdef POSTK_DEBUG_TEMP_FIX_2
 	// Palliative fix. wait for impl.
 	return 0;
-#else
-	return -ENOSYS;
-#endif
 }
 
 int
@@ -10016,7 +10012,7 @@ long syscall(int num, ihk_mc_user_context_t *ctx)
 		l = syscall_generic_forwarding(num, ctx);
 	}
 
-	if (cpu_local_var(current)->proc->ptrace && l != -ENOSYS) {
+	if (cpu_local_var(current)->proc->ptrace) {
 		ihk_mc_syscall_ret(ctx) = l;
 		ptrace_syscall_event(cpu_local_var(current));
 		l = ihk_mc_syscall_ret(ctx);