GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs: remove dead config CONFIG_HAS_COMPAT_EPOLL_EVENT symbol

Browse source 
Remove dead config CONFIG_HAS_COMPAT_EPOLL_EVENT symbol.

Signed-off-by: Jiri Olsa <olsajiri@gmail.com>
Cc: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiri Olsa 2008-02-06 01:36:55 -08:00 • committed by Linus Torvalds
parent de9330d13e
commit 0321155926
2 changed files with 0 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

49
fs/compat.c
View file

@ -2083,51 +2083,6 @@ long asmlinkage compat_sys_nfsservctl(int cmd, void *notused, void *notused2)
#ifdef CONFIG_EPOLL #ifdef CONFIG_EPOLL
#ifdef CONFIG_HAS_COMPAT_EPOLL_EVENT
asmlinkage long compat_sys_epoll_ctl(int epfd, int op, int fd,
struct compat_epoll_event __user *event)
{
long err = 0;
struct compat_epoll_event user;
struct epoll_event __user *kernel = NULL;
if (event) {
if (copy_from_user(&user, event, sizeof(user)))
return -EFAULT;
kernel = compat_alloc_user_space(sizeof(struct epoll_event));
err |= __put_user(user.events, &kernel->events);
err |= __put_user(user.data, &kernel->data);
}
return err ? err : sys_epoll_ctl(epfd, op, fd, kernel);
}
asmlinkage long compat_sys_epoll_wait(int epfd,
struct compat_epoll_event __user *events,
int maxevents, int timeout)
{
long i, ret, err = 0;
struct epoll_event __user *kbuf;
struct epoll_event ev;
if ((maxevents <= 0) ||
(maxevents > (INT_MAX / sizeof(struct epoll_event))))
return -EINVAL;
kbuf = compat_alloc_user_space(sizeof(struct epoll_event) * maxevents);
ret = sys_epoll_wait(epfd, kbuf, maxevents, timeout);
for (i = 0; i < ret; i++) {
err |= __get_user(ev.events, &kbuf[i].events);
err |= __get_user(ev.data, &kbuf[i].data);
err |= __put_user(ev.events, &events->events);
err |= __put_user_unaligned(ev.data, &events->data);
events++;
}
return err ? -EFAULT: ret;
}
#endif /* CONFIG_HAS_COMPAT_EPOLL_EVENT */
#ifdef TIF_RESTORE_SIGMASK #ifdef TIF_RESTORE_SIGMASK
asmlinkage long compat_sys_epoll_pwait(int epfd, asmlinkage long compat_sys_epoll_pwait(int epfd,
struct compat_epoll_event __user *events, struct compat_epoll_event __user *events,
@ -2153,11 +2108,7 @@ asmlinkage long compat_sys_epoll_pwait(int epfd,
sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved); sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved);
} }
#ifdef CONFIG_HAS_COMPAT_EPOLL_EVENT
err = compat_sys_epoll_wait(epfd, events, maxevents, timeout);
#else
err = sys_epoll_wait(epfd, events, maxevents, timeout); err = sys_epoll_wait(epfd, events, maxevents, timeout);
#endif
/* /*
* If we changed the signal mask, we need to restore the original one. * If we changed the signal mask, we need to restore the original one.

8
include/linux/compat.h
View file

@ -257,16 +257,8 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
/* /*
* epoll (fs/eventpoll.c) compat bits follow ... * epoll (fs/eventpoll.c) compat bits follow ...
*/ */
#ifndef CONFIG_HAS_COMPAT_EPOLL_EVENT
struct epoll_event; struct epoll_event;
#define compat_epoll_event epoll_event #define compat_epoll_event epoll_event
#else
asmlinkage long compat_sys_epoll_ctl(int epfd, int op, int fd,
struct compat_epoll_event __user *event);
asmlinkage long compat_sys_epoll_wait(int epfd,
struct compat_epoll_event __user *events,
int maxevents, int timeout);
#endif
asmlinkage long compat_sys_epoll_pwait(int epfd, asmlinkage long compat_sys_epoll_pwait(int epfd,
struct compat_epoll_event __user *events, struct compat_epoll_event __user *events,
int maxevents, int timeout, int maxevents, int timeout,