getrusage-add-the-signal_struct-sig-local-variable.patch removed from -mm tree
The quilt patch titled
Subject: getrusage: add the "signal_struct *sig" local variable
has been removed from the -mm tree. Its filename was
getrusage-add-the-signal_struct-sig-local-variable.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Oleg Nesterov <[email protected]>
Subject: getrusage: add the "signal_struct *sig" local variable
Date: Sat, 9 Sep 2023 19:25:54 +0200
No functional changes, cleanup/preparation.
Signed-off-by Oleg Nesterov <[email protected]>
Cc Eric W. Biederman <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
kernel/sys.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-)
kernel/sys.c renamed from kernel/sys.c~getrusage-add-the-signal_struct-sig-local-variable +19 -18
@@ -1786,6 +1786,7 @@ void getrusage(struct task_struct *p, inunsigned long flags;u64 tgutime, tgstime, utime, stime;unsigned long maxrss =0 ; +struct signal_struct *sig = p->signal;memset ((char *)r,0 ,sizeof (*r)); utime = stime =0 ;
@@ -1793,7 +1794,7 @@ void getrusage(struct task_struct *p, inif (who ==RUSAGE_THREAD ) {task_cputime_adjusted (current, &utime, &stime);accumulate_thread_rusage (p, r); - maxrss = p->signal->maxrss; + maxrss = sig->maxrss; goto out; }
@@ -1803,15 +1804,15 @@ void getrusage(struct task_struct *p, inswitch (who) {case RUSAGE_BOTH :case RUSAGE_CHILDREN : - utime = p->signal->cutime; - stime = p->signal->cstime; - r->ru_nvcsw = p->signal->cnvcsw; - r->ru_nivcsw = p->signal->cnivcsw; - r->ru_minflt = p->signal->cmin_flt; - r->ru_majflt = p->signal->cmaj_flt; - r->ru_inblock = p->signal->cinblock; - r->ru_oublock = p->signal->coublock; - maxrss = p->signal->cmaxrss; + utime = sig->cutime; + stime = sig->cstime; + r->ru_nvcsw = sig->cnvcsw; + r->ru_nivcsw = sig->cnivcsw; + r->ru_minflt = sig->cmin_flt; + r->ru_majflt = sig->cmaj_flt; + r->ru_inblock = sig->cinblock; + r->ru_oublock = sig->coublock; + maxrss = sig->cmaxrss;if (who ==RUSAGE_CHILDREN )break ;
@@ -1821,14 +1822,14 @@ void getrusage(struct task_struct *p, inthread_group_cputime_adjusted (p, &tgutime, &tgstime); utime += tgutime; stime += tgstime; - r->ru_nvcsw += p->signal->nvcsw; - r->ru_nivcsw += p->signal->nivcsw; - r->ru_minflt += p->signal->min_flt; - r->ru_majflt += p->signal->maj_flt; - r->ru_inblock += p->signal->inblock; - r->ru_oublock += p->signal->oublock; -if (maxrss < p->signal->maxrss) - maxrss = p->signal->maxrss; + r->ru_nvcsw += sig->nvcsw; + r->ru_nivcsw += sig->nivcsw; + r->ru_minflt += sig->min_flt; + r->ru_majflt += sig->maj_flt; + r->ru_inblock += sig->inblock; + r->ru_oublock += sig->oublock; +if (maxrss < sig->maxrss) + maxrss = sig->maxrss; t = p; do { accumulate_thread_rusage(t, r);
_
Patches currently in -mm which might be from [email protected] are