The patch titled
add-epoll-compat-code-to-kernel-compatc-tidy
has been removed from the -mm tree. Its filename was
add-epoll-compat-code-to-kernel-compatc-tidy.patch
This patch was dropped because it was folded into add-epoll-compat-code-to-kernel-compatc.patch
------------------------------------------------------
Subject: add-epoll-compat-code-to-kernel-compatc-tidy
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Davide Libenzi <davidel@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/eventpoll.c | 6 ++-
include/linux/compat.h | 26 +++++++++-------
kernel/compat.c | 61 +++++++++++++++++++++------------------
3 files changed, 52 insertions(+), 41 deletions(-)
diff -puN fs/eventpoll.c~add-epoll-compat-code-to-kernel-compatc-tidy fs/eventpoll.c
--- a/fs/eventpoll.c~add-epoll-compat-code-to-kernel-compatc-tidy
+++ a/fs/eventpoll.c
@@ -544,7 +544,8 @@ eexit_1:
* file descriptors inside the interest set. It represents
* the kernel part of the user space epoll_ctl(2).
*/
-asmlinkage long sys_epoll_ctl(int epfd, int op, int fd, struct epoll_event __user *event)
+asmlinkage long sys_epoll_ctl(int epfd, int op, int fd,
+ struct epoll_event __user *event)
{
int error;
struct file *file, *tfile;
@@ -706,7 +707,8 @@ eexit_1:
* part of the user space epoll_pwait(2).
*/
asmlinkage long sys_epoll_pwait(int epfd, struct epoll_event __user *events,
- int maxevents, int timeout, const sigset_t __user *sigmask,
+ int maxevents, int timeout,
+ const sigset_t __user *sigmask,
size_t sigsetsize)
{
int error;
diff -puN include/linux/compat.h~add-epoll-compat-code-to-kernel-compatc-tidy include/linux/compat.h
--- a/include/linux/compat.h~add-epoll-compat-code-to-kernel-compatc-tidy
+++ a/include/linux/compat.h
@@ -245,9 +245,11 @@ struct compat_epoll_event {
};
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);
+ struct compat_epoll_event __user *event);
+asmlinkage long compat_sys_epoll_wait(int epfd,
+ struct compat_epoll_event __user *events,
+ int maxevents, int timeout);
+
/*
* Architectures that does not need "struct epoll_event" translation
* should wire compat_sys_epoll_pwait. The ones that needs "struct epoll_event"
@@ -255,14 +257,16 @@ asmlinkage long compat_sys_epoll_wait(in
* "struct epoll_event" translation is alignof(u64) in 32 bits mode is 4, and
* alignof(u64) in 64 bits mode is 8.
*/
-asmlinkage long compat_sys_epoll_pwait(int epfd, struct epoll_event __user *events,
- int maxevents, int timeout,
- const compat_sigset_t __user *sigmask,
- compat_size_t sigsetsize);
-asmlinkage long compat_sys_epoll_pwait2(int epfd, struct compat_epoll_event __user *events,
- int maxevents, int timeout,
- const compat_sigset_t __user *sigmask,
- compat_size_t sigsetsize);
+asmlinkage long compat_sys_epoll_pwait(int epfd,
+ struct epoll_event __user *events,
+ int maxevents, int timeout,
+ const compat_sigset_t __user *sigmask,
+ compat_size_t sigsetsize);
+asmlinkage long compat_sys_epoll_pwait2(int epfd,
+ struct compat_epoll_event __user *events,
+ int maxevents, int timeout,
+ const compat_sigset_t __user *sigmask,
+ compat_size_t sigsetsize);
#endif /* CONFIG_COMPAT */
#endif /* _LINUX_COMPAT_H */
diff -puN kernel/compat.c~add-epoll-compat-code-to-kernel-compatc-tidy kernel/compat.c
--- a/kernel/compat.c~add-epoll-compat-code-to-kernel-compatc-tidy
+++ a/kernel/compat.c
@@ -1021,8 +1021,7 @@ asmlinkage long compat_sys_migrate_pages
#ifdef CONFIG_EPOLL
/*
-
- epoll (fs/eventpoll.c) compat functions follow ...
+ * epoll (fs/eventpoll.c) compat functions follow ...
*/
asmlinkage long compat_sys_epoll_ctl(int epfd, int op, int fd,
@@ -1050,8 +1049,9 @@ asmlinkage long compat_sys_epoll_ctl(int
}
-asmlinkage long compat_sys_epoll_wait(int epfd, struct compat_epoll_event __user *events,
- int maxevents, int timeout)
+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;
@@ -1061,9 +1061,11 @@ asmlinkage long compat_sys_epoll_wait(in
u32 d[2];
} mux;
- if (maxevents <= 0 || maxevents > (INT_MAX / sizeof(struct epoll_event)))
+ if (maxevents <= 0 || maxevents > (INT_MAX /
+ sizeof(struct epoll_event)))
return -EINVAL;
- kbuf = compat_alloc_user_space(sizeof(struct epoll_event) * maxevents);
+ 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);
@@ -1082,9 +1084,9 @@ asmlinkage long compat_sys_epoll_wait(in
#ifdef TIF_RESTORE_SIGMASK
static long __sys_epoll_pwait(int epfd, void __user *events, int maxevents,
- int timeout, const compat_sigset_t __user *sigmask,
- compat_size_t sigsetsize,
- long (asmlinkage *proc)(int, void __user *, int, int))
+ int timeout, const compat_sigset_t __user *sigmask,
+ compat_size_t sigsetsize,
+ long (asmlinkage *proc)(int, void __user *, int, int))
{
long err;
compat_sigset_t ss32;
@@ -1109,8 +1111,8 @@ static long __sys_epoll_pwait(int epfd,
/*
* If we changed the signal mask, we need to restore the original one.
* In case we've got a signal while waiting, we do not restore the
- * signal mask yet, and we allow do_signal() to deliver the signal on the way
- * back to userspace, before the signal mask is restored.
+ * signal mask yet, and we allow do_signal() to deliver the signal on
+ * the way back to userspace, before the signal mask is restored.
*/
if (sigmask) {
if (err == -EINTR) {
@@ -1124,7 +1126,6 @@ static long __sys_epoll_pwait(int epfd,
return err;
}
-
/*
* Architectures that does not need "struct epoll_event" translation
* should wire compat_sys_epoll_pwait. The ones that needs "struct epoll_event"
@@ -1132,28 +1133,33 @@ static long __sys_epoll_pwait(int epfd,
* "struct epoll_event" translation is alignof(u64) in 32 bits mode is 4, and
* alignof(u64) in 64 bits mode is 8.
*/
-asmlinkage long compat_sys_epoll_pwait(int epfd, struct epoll_event __user *events,
- int maxevents, int timeout,
- const compat_sigset_t __user *sigmask,
- compat_size_t sigsetsize)
+asmlinkage long compat_sys_epoll_pwait(int epfd,
+ struct epoll_event __user *events,
+ int maxevents, int timeout,
+ const compat_sigset_t __user *sigmask,
+ compat_size_t sigsetsize)
{
- return __sys_epoll_pwait(epfd, events, maxevents, timeout, sigmask, sigsetsize,
- (long (asmlinkage *)(int, void __user *, int, int)) sys_epoll_wait);
+ return __sys_epoll_pwait(epfd, events, maxevents, timeout, sigmask,
+ sigsetsize,
+ (long (asmlinkage *)(int, void __user *, int, int))
+ sys_epoll_wait);
}
-asmlinkage long compat_sys_epoll_pwait2(int epfd, struct compat_epoll_event __user *events,
- int maxevents, int timeout,
- const compat_sigset_t __user *sigmask,
- compat_size_t sigsetsize)
+asmlinkage long compat_sys_epoll_pwait2(int epfd,
+ struct compat_epoll_event __user *events,
+ int maxevents, int timeout,
+ const compat_sigset_t __user *sigmask,
+ compat_size_t sigsetsize)
{
- return __sys_epoll_pwait(epfd, events, maxevents, timeout, sigmask, sigsetsize,
- (long (asmlinkage *)(int, void __user *, int, int)) compat_sys_epoll_wait);
+ return __sys_epoll_pwait(epfd, events, maxevents, timeout, sigmask,
+ sigsetsize,
+ (long (asmlinkage *)(int, void __user *, int, int))
+ compat_sys_epoll_wait);
}
-#endif /* #ifdef TIF_RESTORE_SIGMASK */
-
-#endif /* #ifdef CONFIG_EPOLL */
+#endif /* TIF_RESTORE_SIGMASK */
+#endif /* CONFIG_EPOLL */
struct compat_sysinfo {
s32 uptime;
@@ -1219,4 +1225,3 @@ compat_sys_sysinfo(struct compat_sysinfo
return 0;
}
-
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
xfs-warning-fix.patch
rework-reserved-major-handling.patch
mincore-warning-fix.patch
kprobes-list-all-active-probes-in-the-system.patch
add-epoll-compat-code-to-kernel-compatc.patch
add-epoll-compat-code-to-kernel-compatc-tidy.patch
genalloc-warning-fixes.patch
call-cpu_chain-with-cpu_down_failed-if-cpu_down_prepare-failed-vs-reduce-size-of-task_struct-on-64-bit-machines.patch
utrace-vs-reduce-size-of-task_struct-on-64-bit-machines.patch
local_t-mips-extension-shrink-duplicated-mips-32-64-bits-functions-from-localh-fix.patch
linux-kernel-markers-kconfig-menus-fix-4.patch
fb-sm501-framebuffer-driver-5-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
