From d7ef74659b448278a5e44540d45edcca7bf14d25 Mon Sep 17 00:00:00 2001
From: Masamichi Takagi <masamichi.takagi@riken.jp>
Date: Tue, 30 Jun 2020 09:02:32 +0900
Subject: [PATCH] Revert "epoll, ppoll: deschedule on offload, don't do it when
 exiting system call"

This reverts commit d4056acfc34a9a247ea1165abd72aaef9e07155f.

Change-Id: I7df15b9d3957ca571f4b4e2d576799f8b97ae299
---
 kernel/syscall.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/kernel/syscall.c b/kernel/syscall.c
index bb755cbc..7e2c793d 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -243,8 +243,7 @@ long do_syscall(struct syscall_request *req, int cpu)
 			DECLARE_WAITQ_ENTRY(scd_wq_entry, cpu_local_var(current));
 
 			if (req->number == __NR_epoll_wait ||
-				req->number == __NR_epoll_pwait ||
-				req->number == __NR_ppoll)
+				req->number == __NR_epoll_pwait)
 				goto schedule;
 
 			cpu_pause();
@@ -10320,11 +10319,7 @@ long syscall(int num, ihk_mc_user_context_t *ctx)
 	}
 #endif // PROFILE_ENABLE
 
-	/* Do not deschedule when returning from an event (e.g., MPI) */
-	if (!(num == __NR_epoll_wait ||
-				num == __NR_epoll_pwait ||
-				num == __NR_ppoll) &&
-			smp_load_acquire(&v->flags) & CPU_FLAG_NEED_RESCHED) {
+	if (smp_load_acquire(&v->flags) & CPU_FLAG_NEED_RESCHED) {
 		check_need_resched();
 	}