diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-09-13 12:32:33 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-09-13 12:32:33 -0700 |
| commit | ebacb2f20d5b9fbf73d1f90d06eee7553c93aee6 (patch) | |
| tree | 32c71b92387e7c7bb8226ae6c37d8c4b16f87b03 /src/core/lib/iomgr/ev_epollex_linux.c | |
| parent | ac97359fa60cc133a05b3daf07881540c965c68d (diff) | |
Fixes
Diffstat (limited to 'src/core/lib/iomgr/ev_epollex_linux.c')
| -rw-r--r-- | src/core/lib/iomgr/ev_epollex_linux.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/lib/iomgr/ev_epollex_linux.c b/src/core/lib/iomgr/ev_epollex_linux.c index f1a3b97f4d..4e5bed5016 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.c +++ b/src/core/lib/iomgr/ev_epollex_linux.c @@ -666,12 +666,8 @@ static grpc_error *pollset_kick_inner(grpc_exec_ctx *exec_ctx, /* p->po.mu must be held before calling this function */ static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, grpc_pollset_worker *specific_worker) { -<<<<<<< HEAD - pollable *p = pollset->current_pollable; - GRPC_STATS_INC_POLLSET_KICK(exec_ctx); -======= pollable_t *p = pollset->current_pollable; ->>>>>>> d1fefe89dacf198a721053f2b1a3e173f1f24948 + GRPC_STATS_INC_POLLSET_KICK(exec_ctx); if (p != &pollset->pollable) { gpr_mu_lock(&p->po.mu); } |