Received-SPF: pass (google.com: domain of linux-kernel+bounces-163079-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Mon, 29 Apr 2024 23:44:50 +0200
From: Ben Hutchings <ben@decadent.org.uk>
To: Greg KH <gregkh@linuxfoundation.org>,
	Guenter Roeck <linux@roeck-us.net>
Cc: Sasha Levin <sashal@kernel.org>, linux-kernel@vger.kernel.org,
	stable@vger.kernel.org, torvalds@linux-foundation.org,
	akpm@linux-foundation.org, shuah@kernel.org, patches@kernelci.org,
	lkft-triage@lists.linaro.org, pavel@denx.de
Subject: [PATCH 4.19] Revert "y2038: rusage: use __kernel_old_timeval"
Message-ID: <ZjAU0hFgBDotATCy@decadent.org.uk>
References: <2024041118-slingshot-contented-1586@gregkh>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="Nn+ogYiDFdDnSeEP"
Content-Disposition: inline
In-Reply-To: <2024041118-slingshot-contented-1586@gregkh>


--Nn+ogYiDFdDnSeEP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

This reverts commit d5e38d6b84d6d21a4f8a4f555a0908b6d9ffe224, which
was commit bdd565f817a74b9e30edec108f7cb1dbc762b8a6 upstream.  It
broke the build for alpha and that can't be fixed without backporting
other more intrusive y2038 changes.

This was not a completely clean revert as the affected code in
getrusage() was moved by subsequent changes.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 arch/alpha/kernel/osf_sys.c   | 2 +-
 include/uapi/linux/resource.h | 4 ++--
 kernel/sys.c                  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index d5694f263dd6..cff52d8ffdb1 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -964,7 +964,7 @@ put_tv32(struct timeval32 __user *o, struct timespec64 =
*i)
 }
=20
 static inline long
-put_tv_to_tv32(struct timeval32 __user *o, struct __kernel_old_timeval *i)
+put_tv_to_tv32(struct timeval32 __user *o, struct timeval *i)
 {
 	return copy_to_user(o, &(struct timeval32){
 				.tv_sec =3D i->tv_sec,
diff --git a/include/uapi/linux/resource.h b/include/uapi/linux/resource.h
index 74ef57b38f9f..cc00fd079631 100644
--- a/include/uapi/linux/resource.h
+++ b/include/uapi/linux/resource.h
@@ -22,8 +22,8 @@
 #define	RUSAGE_THREAD	1		/* only the calling thread */
=20
 struct	rusage {
-	struct __kernel_old_timeval ru_utime;	/* user time used */
-	struct __kernel_old_timeval ru_stime;	/* system time used */
+	struct timeval ru_utime;	/* user time used */
+	struct timeval ru_stime;	/* system time used */
 	__kernel_long_t	ru_maxrss;	/* maximum resident set size */
 	__kernel_long_t	ru_ixrss;	/* integral shared memory size */
 	__kernel_long_t	ru_idrss;	/* integral unshared data size */
diff --git a/kernel/sys.c b/kernel/sys.c
index 62930aac0bad..690ab55449e7 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1795,8 +1795,8 @@ void getrusage(struct task_struct *p, int who, struct=
 rusage *r)
=20
 out_children:
 	r->ru_maxrss =3D maxrss * (PAGE_SIZE / 1024); /* convert pages to KBs */
-	r->ru_utime =3D ns_to_kernel_old_timeval(utime);
-	r->ru_stime =3D ns_to_kernel_old_timeval(stime);
+	r->ru_utime =3D ns_to_timeval(utime);
+	r->ru_stime =3D ns_to_timeval(stime);
 }
=20
 SYSCALL_DEFINE2(getrusage, int, who, struct rusage __user *, ru)

--Nn+ogYiDFdDnSeEP
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAmYwFMcACgkQ57/I7JWG
EQnF5Q//VBXRzWWcHeyNlMbFndboUCUpjtohfoY5iVPhbs1ESOxb6yl8JJekeR2n
LQyhcftbM4k8ZOG2dlb363TKh6i3pQBKNxrKoT9zcLEcSvjtVWwtF5n2ypJ1S4Dp
saKTGM8YDWcnKKid8PJfH+A0uvvii+JSQlX/CzUIbpq+MGvwyjg0qBVHUvvr38MU
cwzYMubOCWiULZpOYp46L2tLZzDXp0fB/bCnVqj69Za31mDcrWVQ4w+LjzVO/Bx5
nLzPDLvto7bp74ddB8MAB6xHyqAuwj7keZjMQ5bASKdIW9GEnWPgDAb5YjRPfi1w
lOTNOhFq4MIjai6uvolWrhINRTDerdMrD4TuPdocx69+/0FKXHcmfN9gIgD/UiEz
OV2A421j6HaAM9CZ+yJ3NHFz2D7RixFgTn/iMx7S3nPILaV4bCjgfUaR3B3mc9BV
EKVmSWmm1ivqZ+WQdTID/75OrPkdYwMO1cBjosTEW6jdTmcfZs5St46a+Xc1e3Km
ozjyLrs/KtZ/qhcCjHIsHu39LYXVtz8bVCmKUdTe6LMPTowlZYLmuhExgb/q+RJC
pHPTOTxyP3+pMFVJDqnAImyJr6e7Ekl+C3UironQO7XCMcUCLjgCMT+B0ik/ChGq
QQXT26fUkdpTwy4Yy5T0zsuRMDGsrolYrw7xenF/fprMgVizGSo=
=UsXv
-----END PGP SIGNATURE-----

--Nn+ogYiDFdDnSeEP--