summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2006-10-16 09:01:46 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-16 09:14:05 -0700
commit39af114377bf80d2a88e47be33d578d1fa9b0775 (patch)
tree1aa272da4ee90868916c5c8b907d6d57145afbdd /kernel
parent5206a79d7b217c139116fc6faef55d1c0e65c800 (diff)
downloadlinux-39af114377bf80d2a88e47be33d578d1fa9b0775.tar.gz
linux-39af114377bf80d2a88e47be33d578d1fa9b0775.tar.bz2
linux-39af114377bf80d2a88e47be33d578d1fa9b0775.zip
[PATCH] fix epoll_pwait when EPOLL=n
Fixes http://bugzilla.kernel.org/show_bug.cgi?id=7371 sys_epoll_pwait needs to be listed as a conditional (weak) entry point for CONFIG_EPOLL=n. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sys_ni.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index 7a3b2e75f040..0e53314b14de 100644
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -49,6 +49,7 @@ cond_syscall(compat_sys_get_robust_list);
cond_syscall(sys_epoll_create);
cond_syscall(sys_epoll_ctl);
cond_syscall(sys_epoll_wait);
+cond_syscall(sys_epoll_pwait);
cond_syscall(sys_semget);
cond_syscall(sys_semop);
cond_syscall(sys_semtimedop);