Merge branch 'akpm-current/current'

[deliverable/linux.git] / include / linux / relay.h

diff --git a/include/linux/relay.h b/include/linux/relay.h
index ecbb34a382b898cabf40d04237fbfae5534c5bc0..ab0c59e947104e053996fb4141306f79744e92b6 100644 (file)
--- a/include/linux/relay.h
+++ b/include/linux/relay.h
@@ -20,6 +20,7 @@
 #include <linux/poll.h>
 #include <linux/kref.h>
 #include <linux/percpu.h>
+#include <linux/irq_work.h>
 
 /*
  * Tracks changes to rchan/rchan_buf structs
@@ -38,7 +39,7 @@ struct rchan_buf
        size_t subbufs_consumed;        /* count of sub-buffers consumed */
        struct rchan *chan;             /* associated channel */
        wait_queue_head_t read_wait;    /* reader wait queue */
-       struct timer_list timer;        /* reader wake-up timer */
+       struct irq_work wakeup_work;    /* reader wakeup */
        struct dentry *dentry;          /* channel file dentry */
        struct kref kref;               /* channel buffer refcount */
        struct page **page_array;       /* array of current buffer pages */