| From e2c705286a5f9d04d62fa12dce2cea3b2de2a5d1 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Thu, 12 Mar 2020 12:01:49 +0100 |
| Subject: [PATCH] staging: greybus: loopback_test: fix poll-mask build breakage |
| |
| commit 8f3675be4bda33adbdc1dd2ab3b6c76a7599a79e upstream. |
| |
| A scripted conversion from userland POLL* to kernel EPOLL* constants |
| mistakingly replaced the poll flags in the loopback_test tool, which |
| therefore no longer builds. |
| |
| Fixes: a9a08845e9ac ("vfs: do bulk POLL* -> EPOLL* replacement") |
| Cc: stable <stable@vger.kernel.org> # 4.16 |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Link: https://lore.kernel.org/r/20200312110151.22028-2-johan@kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/staging/greybus/tools/loopback_test.c b/drivers/staging/greybus/tools/loopback_test.c |
| index 2fa88092514d..ff8234198e7b 100644 |
| --- a/drivers/staging/greybus/tools/loopback_test.c |
| +++ b/drivers/staging/greybus/tools/loopback_test.c |
| @@ -663,7 +663,7 @@ static int open_poll_files(struct loopback_test *t) |
| goto err; |
| } |
| read(t->fds[fds_idx].fd, &dummy, 1); |
| - t->fds[fds_idx].events = EPOLLERR|EPOLLPRI; |
| + t->fds[fds_idx].events = POLLERR | POLLPRI; |
| t->fds[fds_idx].revents = 0; |
| fds_idx++; |
| } |
| @@ -756,7 +756,7 @@ static int wait_for_complete(struct loopback_test *t) |
| } |
| |
| for (i = 0; i < t->poll_count; i++) { |
| - if (t->fds[i].revents & EPOLLPRI) { |
| + if (t->fds[i].revents & POLLPRI) { |
| /* Dummy read to clear the event */ |
| read(t->fds[i].fd, &dummy, 1); |
| number_of_events++; |
| -- |
| 2.7.4 |
| |
