Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / mm / swapfile.c

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 42fe565..c7a3371 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2705,10 +2705,10 @@ static __poll_t swaps_poll(struct file *file, poll_table *wait)
 
        if (seq->poll_event != atomic_read(&proc_poll_event)) {
                seq->poll_event = atomic_read(&proc_poll_event);
-               return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
+               return EPOLLIN | EPOLLRDNORM | EPOLLERR | EPOLLPRI;
        }
 
-       return POLLIN | POLLRDNORM;
+       return EPOLLIN | EPOLLRDNORM;
 }
 
 /* iterator */