diff options
Diffstat (limited to 'kernel/signal.c')
-rw-r--r-- | kernel/signal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index d51c5ddd855c..f19833b5db3c 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -245,7 +245,7 @@ static inline void print_dropped_signal(int sig) | |||
245 | * RETURNS: | 245 | * RETURNS: |
246 | * %true if @mask is set, %false if made noop because @task was dying. | 246 | * %true if @mask is set, %false if made noop because @task was dying. |
247 | */ | 247 | */ |
248 | bool task_set_jobctl_pending(struct task_struct *task, unsigned int mask) | 248 | bool task_set_jobctl_pending(struct task_struct *task, unsigned long mask) |
249 | { | 249 | { |
250 | BUG_ON(mask & ~(JOBCTL_PENDING_MASK | JOBCTL_STOP_CONSUME | | 250 | BUG_ON(mask & ~(JOBCTL_PENDING_MASK | JOBCTL_STOP_CONSUME | |
251 | JOBCTL_STOP_SIGMASK | JOBCTL_TRAPPING)); | 251 | JOBCTL_STOP_SIGMASK | JOBCTL_TRAPPING)); |
@@ -297,7 +297,7 @@ void task_clear_jobctl_trapping(struct task_struct *task) | |||
297 | * CONTEXT: | 297 | * CONTEXT: |
298 | * Must be called with @task->sighand->siglock held. | 298 | * Must be called with @task->sighand->siglock held. |
299 | */ | 299 | */ |
300 | void task_clear_jobctl_pending(struct task_struct *task, unsigned int mask) | 300 | void task_clear_jobctl_pending(struct task_struct *task, unsigned long mask) |
301 | { | 301 | { |
302 | BUG_ON(mask & ~JOBCTL_PENDING_MASK); | 302 | BUG_ON(mask & ~JOBCTL_PENDING_MASK); |
303 | 303 | ||
@@ -2000,7 +2000,7 @@ static bool do_signal_stop(int signr) | |||
2000 | struct signal_struct *sig = current->signal; | 2000 | struct signal_struct *sig = current->signal; |
2001 | 2001 | ||
2002 | if (!(current->jobctl & JOBCTL_STOP_PENDING)) { | 2002 | if (!(current->jobctl & JOBCTL_STOP_PENDING)) { |
2003 | unsigned int gstop = JOBCTL_STOP_PENDING | JOBCTL_STOP_CONSUME; | 2003 | unsigned long gstop = JOBCTL_STOP_PENDING | JOBCTL_STOP_CONSUME; |
2004 | struct task_struct *t; | 2004 | struct task_struct *t; |
2005 | 2005 | ||
2006 | /* signr will be recorded in task->jobctl for retries */ | 2006 | /* signr will be recorded in task->jobctl for retries */ |