diff options
Diffstat (limited to 'kernel/posix-cpu-timers.c')
| -rw-r--r-- | kernel/posix-cpu-timers.c | 10 | 
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index dbb16bf15c4..1a22dfd42df 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c @@ -1031,9 +1031,10 @@ static void check_thread_timers(struct task_struct *tsk,  	/*  	 * Check for the special case thread timers.  	 */ -	soft = sig->rlim[RLIMIT_RTTIME].rlim_cur; +	soft = ACCESS_ONCE(sig->rlim[RLIMIT_RTTIME].rlim_cur);  	if (soft != RLIM_INFINITY) { -		unsigned long hard = sig->rlim[RLIMIT_RTTIME].rlim_max; +		unsigned long hard = +			ACCESS_ONCE(sig->rlim[RLIMIT_RTTIME].rlim_max);  		if (hard != RLIM_INFINITY &&  		    tsk->rt.timeout > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) { @@ -1194,10 +1195,11 @@ static void check_process_timers(struct task_struct *tsk,  			 SIGPROF);  	check_cpu_itimer(tsk, &sig->it[CPUCLOCK_VIRT], &virt_expires, utime,  			 SIGVTALRM); -	soft = sig->rlim[RLIMIT_CPU].rlim_cur; +	soft = ACCESS_ONCE(sig->rlim[RLIMIT_CPU].rlim_cur);  	if (soft != RLIM_INFINITY) {  		unsigned long psecs = cputime_to_secs(ptime); -		unsigned long hard = sig->rlim[RLIMIT_CPU].rlim_max; +		unsigned long hard = +			ACCESS_ONCE(sig->rlim[RLIMIT_CPU].rlim_max);  		cputime_t x;  		if (psecs >= hard) {  			/*  |