aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc/array.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r--fs/proc/array.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 18e20feee251..aa8637b81028 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -273,7 +273,7 @@ static inline void task_sig(struct seq_file *m, struct task_struct *p)
273 rcu_read_lock(); /* FIXME: is this correct? */ 273 rcu_read_lock(); /* FIXME: is this correct? */
274 qsize = atomic_read(&__task_cred(p)->user->sigpending); 274 qsize = atomic_read(&__task_cred(p)->user->sigpending);
275 rcu_read_unlock(); 275 rcu_read_unlock();
276 qlim = p->signal->rlim[RLIMIT_SIGPENDING].rlim_cur; 276 qlim = task_rlimit(p, RLIMIT_SIGPENDING);
277 unlock_task_sighand(p, &flags); 277 unlock_task_sighand(p, &flags);
278 } 278 }
279 279
@@ -420,7 +420,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
420 cutime = sig->cutime; 420 cutime = sig->cutime;
421 cstime = sig->cstime; 421 cstime = sig->cstime;
422 cgtime = sig->cgtime; 422 cgtime = sig->cgtime;
423 rsslim = sig->rlim[RLIMIT_RSS].rlim_cur; 423 rsslim = ACCESS_ONCE(sig->rlim[RLIMIT_RSS].rlim_cur);
424 424
425 /* add up live thread stats at the group level */ 425 /* add up live thread stats at the group level */
426 if (whole) { 426 if (whole) {