diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 12:32:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 12:32:26 -0400 |
commit | 7f3591cfacf2d79c4f42238e46c7d053da8e020d (patch) | |
tree | f2e9ed7b6b0bc176facaa49846734790023a6b16 /fs | |
parent | 16ffc3eeaa00d513b0076b7b2b96419f28acc912 (diff) | |
parent | d1f0132e76a11b05167313c606a853953f416081 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest: (31 commits)
lguest: add support for indirect ring entries
lguest: suppress notifications in example Launcher
lguest: try to batch interrupts on network receive
lguest: avoid sending interrupts to Guest when no activity occurs.
lguest: implement deferred interrupts in example Launcher
lguest: remove obsolete LHREQ_BREAK call
lguest: have example Launcher service all devices in separate threads
lguest: use eventfds for device notification
eventfd: export eventfd_signal and eventfd_fget for lguest
lguest: allow any process to send interrupts
lguest: PAE fixes
lguest: PAE support
lguest: Add support for kvm_hypercall4()
lguest: replace hypercall name LHCALL_SET_PMD with LHCALL_SET_PGD
lguest: use native_set_* macros, which properly handle 64-bit entries when PAE is activated
lguest: map switcher with executable page table entries
lguest: fix writev returning short on console output
lguest: clean up length-used value in example launcher
lguest: Segment selectors are 16-bit long. Fix lg_cpu.ss1 definition.
lguest: beyond ARRAY_SIZE of cpu->arch.gdt
...
Diffstat (limited to 'fs')
-rw-r--r-- | fs/eventfd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/eventfd.c b/fs/eventfd.c index 2a701d593d3..3f0e1974abd 100644 --- a/fs/eventfd.c +++ b/fs/eventfd.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/anon_inodes.h> | 16 | #include <linux/anon_inodes.h> |
17 | #include <linux/eventfd.h> | 17 | #include <linux/eventfd.h> |
18 | #include <linux/syscalls.h> | 18 | #include <linux/syscalls.h> |
19 | #include <linux/module.h> | ||
19 | 20 | ||
20 | struct eventfd_ctx { | 21 | struct eventfd_ctx { |
21 | wait_queue_head_t wqh; | 22 | wait_queue_head_t wqh; |
@@ -56,6 +57,7 @@ int eventfd_signal(struct file *file, int n) | |||
56 | 57 | ||
57 | return n; | 58 | return n; |
58 | } | 59 | } |
60 | EXPORT_SYMBOL_GPL(eventfd_signal); | ||
59 | 61 | ||
60 | static int eventfd_release(struct inode *inode, struct file *file) | 62 | static int eventfd_release(struct inode *inode, struct file *file) |
61 | { | 63 | { |
@@ -197,6 +199,7 @@ struct file *eventfd_fget(int fd) | |||
197 | 199 | ||
198 | return file; | 200 | return file; |
199 | } | 201 | } |
202 | EXPORT_SYMBOL_GPL(eventfd_fget); | ||
200 | 203 | ||
201 | SYSCALL_DEFINE2(eventfd2, unsigned int, count, int, flags) | 204 | SYSCALL_DEFINE2(eventfd2, unsigned int, count, int, flags) |
202 | { | 205 | { |