diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/signal.c | 4 | ||||
-rw-r--r-- | kernel/stop_machine.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index cc8303cd093d..64ad0ed15992 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -220,7 +220,7 @@ void flush_signals(struct task_struct *t) | |||
220 | unsigned long flags; | 220 | unsigned long flags; |
221 | 221 | ||
222 | spin_lock_irqsave(&t->sighand->siglock, flags); | 222 | spin_lock_irqsave(&t->sighand->siglock, flags); |
223 | clear_tsk_thread_flag(t,TIF_SIGPENDING); | 223 | clear_tsk_thread_flag(t, TIF_SIGPENDING); |
224 | flush_sigqueue(&t->pending); | 224 | flush_sigqueue(&t->pending); |
225 | flush_sigqueue(&t->signal->shared_pending); | 225 | flush_sigqueue(&t->signal->shared_pending); |
226 | spin_unlock_irqrestore(&t->sighand->siglock, flags); | 226 | spin_unlock_irqrestore(&t->sighand->siglock, flags); |
@@ -424,7 +424,7 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info) | |||
424 | } | 424 | } |
425 | if (signr && | 425 | if (signr && |
426 | ((info->si_code & __SI_MASK) == __SI_TIMER) && | 426 | ((info->si_code & __SI_MASK) == __SI_TIMER) && |
427 | info->si_sys_private){ | 427 | info->si_sys_private) { |
428 | /* | 428 | /* |
429 | * Release the siglock to ensure proper locking order | 429 | * Release the siglock to ensure proper locking order |
430 | * of timer locks outside of siglocks. Note, we leave | 430 | * of timer locks outside of siglocks. Note, we leave |
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 6f4e0e13f70c..316283cb60cb 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c | |||
@@ -135,8 +135,7 @@ static void restart_machine(void) | |||
135 | preempt_enable_no_resched(); | 135 | preempt_enable_no_resched(); |
136 | } | 136 | } |
137 | 137 | ||
138 | struct stop_machine_data | 138 | struct stop_machine_data { |
139 | { | ||
140 | int (*fn)(void *); | 139 | int (*fn)(void *); |
141 | void *data; | 140 | void *data; |
142 | struct completion done; | 141 | struct completion done; |