projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
fs
/
eventpoll.c
diff --git
a/fs/eventpoll.c
b/fs/eventpoll.c
index 0d237182d7217876a223a035e6c80afe5988cd18..221086fef1743545c143a270bd1bc228cfb33561 100644
(file)
--- a/
fs/eventpoll.c
+++ b/
fs/eventpoll.c
@@
-1241,7
+1241,7
@@
error_return:
return error;
}
return error;
}
-#ifdef
TIF
_RESTORE_SIGMASK
+#ifdef
HAVE_SET
_RESTORE_SIGMASK
/*
* Implement the event wait interface for the eventpoll file. It is the kernel
/*
* Implement the event wait interface for the eventpoll file. It is the kernel
@@
-1279,7
+1279,7
@@
asmlinkage long sys_epoll_pwait(int epfd, struct epoll_event __user *events,
if (error == -EINTR) {
memcpy(¤t->saved_sigmask, &sigsaved,
sizeof(sigsaved));
if (error == -EINTR) {
memcpy(¤t->saved_sigmask, &sigsaved,
sizeof(sigsaved));
- set_
thread_flag(TIF_RESTORE_SIGMASK
);
+ set_
restore_sigmask(
);
} else
sigprocmask(SIG_SETMASK, &sigsaved, NULL);
}
} else
sigprocmask(SIG_SETMASK, &sigsaved, NULL);
}
@@
-1287,7
+1287,7
@@
asmlinkage long sys_epoll_pwait(int epfd, struct epoll_event __user *events,
return error;
}
return error;
}
-#endif /*
#ifdef TIF
_RESTORE_SIGMASK */
+#endif /*
HAVE_SET
_RESTORE_SIGMASK */
static int __init eventpoll_init(void)
{
static int __init eventpoll_init(void)
{
@@
-1309,4
+1309,3
@@
static int __init eventpoll_init(void)
return 0;
}
fs_initcall(eventpoll_init);
return 0;
}
fs_initcall(eventpoll_init);
-