diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-12-04 22:48:30 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-12-04 22:48:30 +0100 |
| commit | fc284d631894d8673d229fad92762b66c9875cab (patch) | |
| tree | 7b530667b9f7c5c4899c024abda518283abf80b4 /kernel/signal.c | |
| parent | 444f9e99a840c4050c0530cfef81801a21a59f4c (diff) | |
| parent | e0224418516b4d8a6c2160574bac18447c354ef0 (diff) | |
Merge branch 'from-rusty/modules-next' into for-4.5/core
As agreed with Rusty, we're taking a current module-next pile through
livepatching.git, as it contains solely patches that are pre-requisity
for module page protection cleanups in livepatching. Rusty will be
restarting module-next from scratch.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index c0b01fe24bbd..f3f1f7a972fd 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -3503,7 +3503,7 @@ SYSCALL_DEFINE0(pause) #endif -int sigsuspend(sigset_t *set) +static int sigsuspend(sigset_t *set) { current->saved_sigmask = current->blocked; set_current_blocked(set); |