aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ppp
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-02-11 17:34:03 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2018-02-11 17:34:03 -0500
commita9a08845e9acbd224e4ee466f5c1275ed50054e8 (patch)
tree415d6e6a82e001c65e6b161539411f54ba5fe8ce /drivers/net/ppp
parentee5daa1361fceb6f482c005bcc9ba8d01b92ea5c (diff)
vfs: do bulk POLL* -> EPOLL* replacement
This is the mindless scripted replacement of kernel use of POLL* variables as described by Al, done by this script: for V in IN OUT PRI ERR RDNORM RDBAND WRNORM WRBAND HUP RDHUP NVAL MSG; do L=`git grep -l -w POLL$V | grep -v '^t' | grep -v /um/ | grep -v '^sa' | grep -v '/poll.h$'|grep -v '^D'` for f in $L; do sed -i "-es/^\([^\"]*\)\(\<POLL$V\>\)/\\1E\\2/" $f; done done with de-mangling cleanups yet to come. NOTE! On almost all architectures, the EPOLL* constants have the same values as the POLL* constants do. But they keyword here is "almost". For various bad reasons they aren't the same, and epoll() doesn't actually work quite correctly in some cases due to this on Sparc et al. The next patch from Al will sort out the final differences, and we should be all done. Scripted-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/ppp')
-rw-r--r--drivers/net/ppp/ppp_generic.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index ef6b2126b23a..255a5def56e9 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -539,11 +539,11 @@ static __poll_t ppp_poll(struct file *file, poll_table *wait)
539 if (!pf) 539 if (!pf)
540 return 0; 540 return 0;
541 poll_wait(file, &pf->rwait, wait); 541 poll_wait(file, &pf->rwait, wait);
542 mask = POLLOUT | POLLWRNORM; 542 mask = EPOLLOUT | EPOLLWRNORM;
543 if (skb_peek(&pf->rq)) 543 if (skb_peek(&pf->rq))
544 mask |= POLLIN | POLLRDNORM; 544 mask |= EPOLLIN | EPOLLRDNORM;
545 if (pf->dead) 545 if (pf->dead)
546 mask |= POLLHUP; 546 mask |= EPOLLHUP;
547 else if (pf->kind == INTERFACE) { 547 else if (pf->kind == INTERFACE) {
548 /* see comment in ppp_read */ 548 /* see comment in ppp_read */
549 struct ppp *ppp = PF_TO_PPP(pf); 549 struct ppp *ppp = PF_TO_PPP(pf);
@@ -551,7 +551,7 @@ static __poll_t ppp_poll(struct file *file, poll_table *wait)
551 ppp_recv_lock(ppp); 551 ppp_recv_lock(ppp);
552 if (ppp->n_channels == 0 && 552 if (ppp->n_channels == 0 &&
553 (ppp->flags & SC_LOOP_TRAFFIC) == 0) 553 (ppp->flags & SC_LOOP_TRAFFIC) == 0)
554 mask |= POLLIN | POLLRDNORM; 554 mask |= EPOLLIN | EPOLLRDNORM;
555 ppp_recv_unlock(ppp); 555 ppp_recv_unlock(ppp);
556 } 556 }
557 557