posix-cpu-timers: Make expiry_active check actually work correctly

[sfrench/cifs-2.6.git] / kernel / time / posix-cpu-timers.c

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 73c492ce404b1d48013e4e4fe349bb5087a57d2c..c3a95b1222094d9f070be19c1f56538ed3b9d732 100644 (file)
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -884,16 +884,17 @@ static void check_process_timers(struct task_struct *tsk,
 
        /*
         * If there are no active process wide timers (POSIX 1.b, itimers,
-        * RLIMIT_CPU) nothing to check.
+        * RLIMIT_CPU) nothing to check. Also skip the process wide timer
+        * processing when there is already another task handling them.
         */
-       if (!READ_ONCE(pct->timers_active))
+       if (!READ_ONCE(pct->timers_active) || pct->expiry_active)
                return;
 
-       /*
+       /*
         * Signify that a thread is checking for process timers.
         * Write access to this field is protected by the sighand lock.
         */
-       pct->timers_active = true;
+       pct->expiry_active = true;
 
        /*
         * Collect the current process totals. Group accounting is active