Date: Sat, 11 May 2024 19:21:21 -0600 From: Warner Losh <imp@bsdimp.com> To: Warner Losh <imp@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, "<dev-commits-src-main@freebsd.org>" <dev-commits-src-main@freebsd.org> Subject: Re: git: 02f481a30b82 - main - linprocfs: Fix i386 time type Message-ID: <CANCZdfrVuytd_yhThzuWBb5SbTek5jyXVDFKit1Dh8ArwCB2FA@mail.gmail.com> In-Reply-To: <202405120039.44C0dDhe052663@gitrepo.freebsd.org> References: <202405120039.44C0dDhe052663@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000e814320618379619 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, May 11, 2024, 6:39=E2=80=AFPM Warner Losh <imp@freebsd.org> wrote: > The branch main has been updated by imp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D02f481a30b8269c7cad24ec2920ca09= 751708a1e > > commit 02f481a30b8269c7cad24ec2920ca09751708a1e > Author: Warner Losh <imp@FreeBSD.org> > AuthorDate: 2024-05-11 22:36:23 +0000 > Commit: Warner Losh <imp@FreeBSD.org> > CommitDate: 2024-05-12 00:38:17 +0000 > > linprocfs: Fix i386 time type > > Cast the time type to (long). This is correct on all architectures. O= n > i386, this promotes the int time_t to a long (which is also 32-bit). = On > 64-bit architectures, this promotes the 64-bit signed time_t to a > 64-bit > signed int type. > While this compiles everywhere, it will trucate on armv7 and powerpc. I'll fix it after the play I'm about to see when I realized this. Sorry for the churn. Warner Sponsored by: Netflix > --- > sys/compat/linprocfs/linprocfs.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/sys/compat/linprocfs/linprocfs.c > b/sys/compat/linprocfs/linprocfs.c > index a877d4065c18..aa5af0b3c1c1 100644 > --- a/sys/compat/linprocfs/linprocfs.c > +++ b/sys/compat/linprocfs/linprocfs.c > @@ -2145,9 +2145,9 @@ again: > msqids[id].u.msg_perm.gid, > msqids[id].u.msg_perm.cuid, > msqids[id].u.msg_perm.cgid, > - msqids[id].u.msg_stime, > - msqids[id].u.msg_rtime, > - msqids[id].u.msg_ctime); > + (long)msqids[id].u.msg_stime, > + (long)msqids[id].u.msg_rtime, > + (long)msqids[id].u.msg_ctime); > > free(msqids, M_TEMP); > return (0); > @@ -2199,8 +2199,8 @@ again: > semids[id].u.sem_perm.gid, > semids[id].u.sem_perm.cuid, > semids[id].u.sem_perm.cgid, > - semids[id].u.sem_otime, > - semids[id].u.sem_ctime); > + (long)semids[id].u.sem_otime, > + (long)semids[id].u.sem_ctime); > > free(semids, M_TEMP); > return (0); > @@ -2256,9 +2256,9 @@ again: > shmids[id].u.shm_perm.gid, > shmids[id].u.shm_perm.cuid, > shmids[id].u.shm_perm.cgid, > - shmids[id].u.shm_atime, > - shmids[id].u.shm_dtime, > - shmids[id].u.shm_ctime, > + (long)shmids[id].u.shm_atime, > + (long)shmids[id].u.shm_dtime, > + (long)shmids[id].u.shm_ctime, > 0, 0); /* XXX rss & swp are not supporte= d > */ > > free(shmids, M_TEMP); > --000000000000e814320618379619 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: base64 PGRpdiBkaXI9ImF1dG8iPjxkaXY+PGJyPjxicj48ZGl2IGNsYXNzPSJnbWFpbF9xdW90ZSI+PGRp diBkaXI9Imx0ciIgY2xhc3M9ImdtYWlsX2F0dHIiPk9uIFNhdCwgTWF5IDExLCAyMDI0LCA2OjM5 4oCvUE0gV2FybmVyIExvc2ggJmx0OzxhIGhyZWY9Im1haWx0bzppbXBAZnJlZWJzZC5vcmciPmlt cEBmcmVlYnNkLm9yZzwvYT4mZ3Q7IHdyb3RlOjxicj48L2Rpdj48YmxvY2txdW90ZSBjbGFzcz0i Z21haWxfcXVvdGUiIHN0eWxlPSJtYXJnaW46MCAwIDAgLjhleDtib3JkZXItbGVmdDoxcHggI2Nj YyBzb2xpZDtwYWRkaW5nLWxlZnQ6MWV4Ij5UaGUgYnJhbmNoIG1haW4gaGFzIGJlZW4gdXBkYXRl ZCBieSBpbXA6PGJyPg0KPGJyPg0KVVJMOiA8YSBocmVmPSJodHRwczovL2NnaXQuRnJlZUJTRC5v cmcvc3JjL2NvbW1pdC8/aWQ9MDJmNDgxYTMwYjgyNjljN2NhZDI0ZWMyOTIwY2EwOTc1MTcwOGEx ZSIgcmVsPSJub3JlZmVycmVyIG5vcmVmZXJyZXIiIHRhcmdldD0iX2JsYW5rIj5odHRwczovL2Nn aXQuRnJlZUJTRC5vcmcvc3JjL2NvbW1pdC8/aWQ9MDJmNDgxYTMwYjgyNjljN2NhZDI0ZWMyOTIw Y2EwOTc1MTcwOGExZTwvYT48YnI+DQo8YnI+DQpjb21taXQgMDJmNDgxYTMwYjgyNjljN2NhZDI0 ZWMyOTIwY2EwOTc1MTcwOGExZTxicj4NCkF1dGhvcjrCoCDCoCDCoFdhcm5lciBMb3NoICZsdDtp bXBARnJlZUJTRC5vcmcmZ3Q7PGJyPg0KQXV0aG9yRGF0ZTogMjAyNC0wNS0xMSAyMjozNjoyMyAr MDAwMDxicj4NCkNvbW1pdDrCoCDCoCDCoFdhcm5lciBMb3NoICZsdDtpbXBARnJlZUJTRC5vcmcm Z3Q7PGJyPg0KQ29tbWl0RGF0ZTogMjAyNC0wNS0xMiAwMDozODoxNyArMDAwMDxicj4NCjxicj4N CsKgIMKgIGxpbnByb2NmczogRml4IGkzODYgdGltZSB0eXBlPGJyPg0KPGJyPg0KwqAgwqAgQ2Fz dCB0aGUgdGltZSB0eXBlIHRvIChsb25nKS4gVGhpcyBpcyBjb3JyZWN0IG9uIGFsbCBhcmNoaXRl Y3R1cmVzLiBPbjxicj4NCsKgIMKgIGkzODYsIHRoaXMgcHJvbW90ZXMgdGhlIGludCB0aW1lX3Qg dG8gYSBsb25nICh3aGljaCBpcyBhbHNvIDMyLWJpdCkuIE9uPGJyPg0KwqAgwqAgNjQtYml0IGFy Y2hpdGVjdHVyZXMsIHRoaXMgcHJvbW90ZXMgdGhlIDY0LWJpdCBzaWduZWQgdGltZV90IHRvIGEg NjQtYml0PGJyPg0KwqAgwqAgc2lnbmVkIGludCB0eXBlLjxicj48L2Jsb2NrcXVvdGU+PC9kaXY+ PC9kaXY+PGRpdiBkaXI9ImF1dG8iPjxicj48L2Rpdj48ZGl2IGRpcj0iYXV0byI+V2hpbGUgdGhp cyBjb21waWxlcyBldmVyeXdoZXJlLCBpdCB3aWxsIHRydWNhdGUgb24gYXJtdjcgYW5kIHBvd2Vy cGMuIEkmIzM5O2xsIGZpeCBpdCBhZnRlciB0aGUgcGxheSBJJiMzOTttIGFib3V0IHRvIHNlZSB3 aGVuIEkgcmVhbGl6ZWQgdGhpcy4gU29ycnkgZm9yIHRoZSBjaHVybi48L2Rpdj48ZGl2IGRpcj0i YXV0byI+PGJyPjwvZGl2PjxkaXYgZGlyPSJhdXRvIj5XYXJuZXI8L2Rpdj48ZGl2IGRpcj0iYXV0 byI+PGJyPjwvZGl2PjxkaXYgZGlyPSJhdXRvIj48ZGl2IGNsYXNzPSJnbWFpbF9xdW90ZSI+PGJs b2NrcXVvdGUgY2xhc3M9ImdtYWlsX3F1b3RlIiBzdHlsZT0ibWFyZ2luOjAgMCAwIC44ZXg7Ym9y ZGVyLWxlZnQ6MXB4ICNjY2Mgc29saWQ7cGFkZGluZy1sZWZ0OjFleCI+DQrCoCDCoCBTcG9uc29y ZWQgYnk6wqAgwqAgwqAgwqAgwqAgwqBOZXRmbGl4PGJyPg0KLS0tPGJyPg0KwqBzeXMvY29tcGF0 L2xpbnByb2Nmcy9saW5wcm9jZnMuYyB8IDE2ICsrKysrKysrLS0tLS0tLS08YnI+DQrCoDEgZmls ZSBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pPGJyPg0KPGJyPg0KZGlm ZiAtLWdpdCBhL3N5cy9jb21wYXQvbGlucHJvY2ZzL2xpbnByb2Nmcy5jIGIvc3lzL2NvbXBhdC9s aW5wcm9jZnMvbGlucHJvY2ZzLmM8YnI+DQppbmRleCBhODc3ZDQwNjVjMTguLmFhNWFmMGIzYzFj MSAxMDA2NDQ8YnI+DQotLS0gYS9zeXMvY29tcGF0L2xpbnByb2Nmcy9saW5wcm9jZnMuYzxicj4N CisrKyBiL3N5cy9jb21wYXQvbGlucHJvY2ZzL2xpbnByb2Nmcy5jPGJyPg0KQEAgLTIxNDUsOSAr MjE0NSw5IEBAIGFnYWluOjxicj4NCsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIG1zcWlkc1tpZF0udS5tc2dfcGVybS5naWQsPGJyPg0KwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgbXNxaWRzW2lkXS51Lm1zZ19wZXJtLmN1aWQsPGJyPg0K wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgbXNxaWRzW2lkXS51Lm1z Z19wZXJtLmNnaWQsPGJyPg0KLcKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgbXNxaWRzW2lkXS51Lm1zZ19zdGltZSw8YnI+DQotwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqBtc3FpZHNbaWRdLnUubXNnX3J0aW1lLDxicj4NCi3CoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoG1zcWlkc1tpZF0udS5tc2dfY3RpbWUpOzxi cj4NCivCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoChsb25nKW1zcWlk c1tpZF0udS5tc2dfc3RpbWUsPGJyPg0KK8KgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgKGxvbmcpbXNxaWRzW2lkXS51Lm1zZ19ydGltZSw8YnI+DQorwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAobG9uZyltc3FpZHNbaWRdLnUubXNnX2N0aW1l KTs8YnI+DQo8YnI+DQrCoCDCoCDCoCDCoCBmcmVlKG1zcWlkcywgTV9URU1QKTs8YnI+DQrCoCDC oCDCoCDCoCByZXR1cm4gKDApOzxicj4NCkBAIC0yMTk5LDggKzIxOTksOCBAQCBhZ2Fpbjo8YnI+ DQrCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBzZW1pZHNbaWRdLnUu c2VtX3Blcm0uZ2lkLDxicj4NCsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIHNlbWlkc1tpZF0udS5zZW1fcGVybS5jdWlkLDxicj4NCsKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIHNlbWlkc1tpZF0udS5zZW1fcGVybS5jZ2lkLDxicj4NCi3C oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoHNlbWlkc1tpZF0udS5zZW1f b3RpbWUsPGJyPg0KLcKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgc2Vt aWRzW2lkXS51LnNlbV9jdGltZSk7PGJyPg0KK8KgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgKGxvbmcpc2VtaWRzW2lkXS51LnNlbV9vdGltZSw8YnI+DQorwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAobG9uZylzZW1pZHNbaWRdLnUuc2VtX2N0 aW1lKTs8YnI+DQo8YnI+DQrCoCDCoCDCoCDCoCBmcmVlKHNlbWlkcywgTV9URU1QKTs8YnI+DQrC oCDCoCDCoCDCoCByZXR1cm4gKDApOzxicj4NCkBAIC0yMjU2LDkgKzIyNTYsOSBAQCBhZ2Fpbjo8 YnI+DQrCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBzaG1pZHNbaWRd LnUuc2htX3Blcm0uZ2lkLDxicj4NCsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIHNobWlkc1tpZF0udS5zaG1fcGVybS5jdWlkLDxicj4NCsKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHNobWlkc1tpZF0udS5zaG1fcGVybS5jZ2lkLDxicj4N Ci3CoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoHNobWlkc1tpZF0udS5z aG1fYXRpbWUsPGJyPg0KLcKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg c2htaWRzW2lkXS51LnNobV9kdGltZSw8YnI+DQotwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqBzaG1pZHNbaWRdLnUuc2htX2N0aW1lLDxicj4NCivCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoChsb25nKXNobWlkc1tpZF0udS5zaG1fYXRpbWUs PGJyPg0KK8KgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgKGxvbmcpc2ht aWRzW2lkXS51LnNobV9kdGltZSw8YnI+DQorwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAobG9uZylzaG1pZHNbaWRdLnUuc2htX2N0aW1lLDxicj4NCsKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIDAsIDApO8KgIMKgIMKgIC8qIFhYWCByc3Mg JmFtcDsgc3dwIGFyZSBub3Qgc3VwcG9ydGVkICovPGJyPg0KPGJyPg0KwqAgwqAgwqAgwqAgZnJl ZShzaG1pZHMsIE1fVEVNUCk7PGJyPg0KPC9ibG9ja3F1b3RlPjwvZGl2PjwvZGl2PjwvZGl2Pg0K --000000000000e814320618379619--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfrVuytd_yhThzuWBb5SbTek5jyXVDFKit1Dh8ArwCB2FA>