git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
watchdog: jz4740: Pass device to clk_get
[pandora-kernel.git]
/
fs
/
eventpoll.c
diff --git
a/fs/eventpoll.c
b/fs/eventpoll.c
index
0cff443
..
9ad17b1
100644
(file)
--- a/
fs/eventpoll.c
+++ b/
fs/eventpoll.c
@@
-1977,8
+1977,8
@@
SYSCALL_DEFINE6(epoll_pwait, int, epfd, struct epoll_event __user *, events,
return -EINVAL;
if (copy_from_user(&ksigmask, sigmask, sizeof(ksigmask)))
return -EFAULT;
return -EINVAL;
if (copy_from_user(&ksigmask, sigmask, sizeof(ksigmask)))
return -EFAULT;
- sig
delsetmask(&ksigmask, sigmask(SIGKILL) | sigmask(SIGSTOP))
;
- s
igprocmask(SIG_SETMASK, &ksigmask, &sigsaved
);
+ sig
saved = current->blocked
;
+ s
et_current_blocked(&ksigmask
);
}
error = sys_epoll_wait(epfd, events, maxevents, timeout);
}
error = sys_epoll_wait(epfd, events, maxevents, timeout);
@@
-1995,7
+1995,7
@@
SYSCALL_DEFINE6(epoll_pwait, int, epfd, struct epoll_event __user *, events,
sizeof(sigsaved));
set_restore_sigmask();
} else
sizeof(sigsaved));
set_restore_sigmask();
} else
- s
igprocmask(SIG_SETMASK, &sigsaved, NULL
);
+ s
et_current_blocked(&sigsaved
);
}
return error;
}
return error;
@@
-2022,8
+2022,8
@@
COMPAT_SYSCALL_DEFINE6(epoll_pwait, int, epfd,
if (copy_from_user(&csigmask, sigmask, sizeof(csigmask)))
return -EFAULT;
sigset_from_compat(&ksigmask, &csigmask);
if (copy_from_user(&csigmask, sigmask, sizeof(csigmask)))
return -EFAULT;
sigset_from_compat(&ksigmask, &csigmask);
- sig
delsetmask(&ksigmask, sigmask(SIGKILL) | sigmask(SIGSTOP))
;
- s
igprocmask(SIG_SETMASK, &ksigmask, &sigsaved
);
+ sig
saved = current->blocked
;
+ s
et_current_blocked(&ksigmask
);
}
err = sys_epoll_wait(epfd, events, maxevents, timeout);
}
err = sys_epoll_wait(epfd, events, maxevents, timeout);
@@
-2040,7
+2040,7
@@
COMPAT_SYSCALL_DEFINE6(epoll_pwait, int, epfd,
sizeof(sigsaved));
set_restore_sigmask();
} else
sizeof(sigsaved));
set_restore_sigmask();
} else
- s
igprocmask(SIG_SETMASK, &sigsaved, NULL
);
+ s
et_current_blocked(&sigsaved
);
}
return err;
}
return err;