diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-01-24 10:53:20 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-01-24 10:53:20 -0800 |
| commit | 0f2e2e4a426f5fd8fd46b08679dcbfccc151ca98 (patch) | |
| tree | 9fcae63c33ad08834cdf88ef3a206bbe163c4406 /src/core/lib/iomgr/ev_epoll_linux.c | |
| parent | f9623b21ffb3ca17b36f3ee8f1100dc1f7eb858f (diff) | |
| parent | 52f545f1db0f910f8474c10f1dfcd937f01cf1d3 (diff) | |
Merge github.com:grpc/grpc into rollfwd
Diffstat (limited to 'src/core/lib/iomgr/ev_epoll_linux.c')
| -rw-r--r-- | src/core/lib/iomgr/ev_epoll_linux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/ev_epoll_linux.c b/src/core/lib/iomgr/ev_epoll_linux.c index 39b5c0032e..0a565565bd 100644 --- a/src/core/lib/iomgr/ev_epoll_linux.c +++ b/src/core/lib/iomgr/ev_epoll_linux.c @@ -796,7 +796,7 @@ static polling_island *polling_island_merge(polling_island *p, gpr_atm_rel_store(&p->merged_to, (gpr_atm)q); PI_ADD_REF(q, "pi_merge"); /* To account for the new incoming ref from p */ - workqueue_move_items_to_parent(q); + workqueue_move_items_to_parent(p); } /* else if p == q, nothing needs to be done */ |