diff options
Diffstat (limited to 'kernel/posix-cpu-timers.c')
-rw-r--r-- | kernel/posix-cpu-timers.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index 30ab39a27736..ccb04683bf18 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c | |||
@@ -1285,30 +1285,30 @@ void run_posix_cpu_timers(struct task_struct *tsk) | |||
1285 | 1285 | ||
1286 | #undef UNEXPIRED | 1286 | #undef UNEXPIRED |
1287 | 1287 | ||
1288 | BUG_ON(tsk->exit_state); | ||
1289 | |||
1290 | /* | 1288 | /* |
1291 | * Double-check with locks held. | 1289 | * Double-check with locks held. |
1292 | */ | 1290 | */ |
1293 | read_lock(&tasklist_lock); | 1291 | read_lock(&tasklist_lock); |
1294 | spin_lock(&tsk->sighand->siglock); | 1292 | if (likely(tsk->signal != NULL)) { |
1293 | spin_lock(&tsk->sighand->siglock); | ||
1295 | 1294 | ||
1296 | /* | 1295 | /* |
1297 | * Here we take off tsk->cpu_timers[N] and tsk->signal->cpu_timers[N] | 1296 | * Here we take off tsk->cpu_timers[N] and tsk->signal->cpu_timers[N] |
1298 | * all the timers that are firing, and put them on the firing list. | 1297 | * all the timers that are firing, and put them on the firing list. |
1299 | */ | 1298 | */ |
1300 | check_thread_timers(tsk, &firing); | 1299 | check_thread_timers(tsk, &firing); |
1301 | check_process_timers(tsk, &firing); | 1300 | check_process_timers(tsk, &firing); |
1302 | 1301 | ||
1303 | /* | 1302 | /* |
1304 | * We must release these locks before taking any timer's lock. | 1303 | * We must release these locks before taking any timer's lock. |
1305 | * There is a potential race with timer deletion here, as the | 1304 | * There is a potential race with timer deletion here, as the |
1306 | * siglock now protects our private firing list. We have set | 1305 | * siglock now protects our private firing list. We have set |
1307 | * the firing flag in each timer, so that a deletion attempt | 1306 | * the firing flag in each timer, so that a deletion attempt |
1308 | * that gets the timer lock before we do will give it up and | 1307 | * that gets the timer lock before we do will give it up and |
1309 | * spin until we've taken care of that timer below. | 1308 | * spin until we've taken care of that timer below. |
1310 | */ | 1309 | */ |
1311 | spin_unlock(&tsk->sighand->siglock); | 1310 | spin_unlock(&tsk->sighand->siglock); |
1311 | } | ||
1312 | read_unlock(&tasklist_lock); | 1312 | read_unlock(&tasklist_lock); |
1313 | 1313 | ||
1314 | /* | 1314 | /* |