Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[mirror_ubuntu-jammy-kernel.git] / kernel / events / core.c

diff --git a/kernel/events/core.c b/kernel/events/core.c
index d99fe3fdec8adb18845d42da4d2a75dbcbba6016..d0d9bfb47d2e32473cf0397f402d04e9ab1218cf 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -4520,11 +4520,11 @@ perf_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
        return ret;
 }
 
-static unsigned int perf_poll(struct file *file, poll_table *wait)
+static __poll_t perf_poll(struct file *file, poll_table *wait)
 {
        struct perf_event *event = file->private_data;
        struct ring_buffer *rb;
-       unsigned int events = POLLHUP;
+       __poll_t events = POLLHUP;
 
        poll_wait(file, &event->waitq, wait);
 
@@ -4913,6 +4913,7 @@ void perf_event_update_userpage(struct perf_event *event)
 unlock:
        rcu_read_unlock();
 }
+EXPORT_SYMBOL_GPL(perf_event_update_userpage);
 
 static int perf_mmap_fault(struct vm_fault *vmf)
 {