Module Name: src Committed By: riastradh Date: Tue Oct 1 16:35:42 UTC 2024
Modified Files: src/sys/compat/linux/arch/alpha: linux_osf1.c linux_types.h src/sys/compat/linux/arch/amd64: Makefile linux_errno.h linux_exec.h linux_exec_machdep.c linux_fcntl.h linux_ioctl.h linux_machdep.c linux_machdep.h linux_mmap.h linux_prctl.h linux_sigarray.c linux_siginfo.h linux_signal.h linux_socket.h linux_termios.h linux_types.h src/sys/compat/linux/arch/m68k: linux_machdep.c Log Message: sys/compat/linux/arch: Nix trailing whitespace. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/compat/linux/arch/alpha/linux_osf1.c cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux/arch/alpha/linux_types.h cvs rdiff -u -r1.4 -r1.5 src/sys/compat/linux/arch/amd64/Makefile cvs rdiff -u -r1.3 -r1.4 src/sys/compat/linux/arch/amd64/linux_errno.h \ src/sys/compat/linux/arch/amd64/linux_mmap.h \ src/sys/compat/linux/arch/amd64/linux_socket.h \ src/sys/compat/linux/arch/amd64/linux_termios.h cvs rdiff -u -r1.6 -r1.7 src/sys/compat/linux/arch/amd64/linux_exec.h \ src/sys/compat/linux/arch/amd64/linux_types.h cvs rdiff -u -r1.24 -r1.25 \ src/sys/compat/linux/arch/amd64/linux_exec_machdep.c cvs rdiff -u -r1.5 -r1.6 src/sys/compat/linux/arch/amd64/linux_fcntl.h \ src/sys/compat/linux/arch/amd64/linux_signal.h cvs rdiff -u -r1.2 -r1.3 src/sys/compat/linux/arch/amd64/linux_ioctl.h \ src/sys/compat/linux/arch/amd64/linux_prctl.h \ src/sys/compat/linux/arch/amd64/linux_sigarray.c cvs rdiff -u -r1.61 -r1.62 src/sys/compat/linux/arch/amd64/linux_machdep.c cvs rdiff -u -r1.14 -r1.15 src/sys/compat/linux/arch/amd64/linux_machdep.h cvs rdiff -u -r1.7 -r1.8 src/sys/compat/linux/arch/amd64/linux_siginfo.h cvs rdiff -u -r1.44 -r1.45 src/sys/compat/linux/arch/m68k/linux_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/compat/linux/arch/alpha/linux_osf1.c diff -u src/sys/compat/linux/arch/alpha/linux_osf1.c:1.5 src/sys/compat/linux/arch/alpha/linux_osf1.c:1.6 --- src/sys/compat/linux/arch/alpha/linux_osf1.c:1.5 Tue Sep 7 11:43:03 2021 +++ src/sys/compat/linux/arch/alpha/linux_osf1.c Tue Oct 1 16:35:41 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_osf1.c,v 1.5 2021/09/07 11:43:03 riastradh Exp $ */ +/* $NetBSD: linux_osf1.c,v 1.6 2024/10/01 16:35:41 riastradh Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_osf1.c,v 1.5 2021/09/07 11:43:03 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_osf1.c,v 1.6 2024/10/01 16:35:41 riastradh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -372,7 +372,7 @@ linux_sys_osf1_setitimer(struct lwp *l, if (error) return error; } - + error = dosetitimer(l->l_proc, which, &b_itv); if (error == 0 || SCARG(uap, oitv) == NULL) Index: src/sys/compat/linux/arch/alpha/linux_types.h diff -u src/sys/compat/linux/arch/alpha/linux_types.h:1.8 src/sys/compat/linux/arch/alpha/linux_types.h:1.9 --- src/sys/compat/linux/arch/alpha/linux_types.h:1.8 Sun Feb 12 14:59:22 2023 +++ src/sys/compat/linux/arch/alpha/linux_types.h Tue Oct 1 16:35:41 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_types.h,v 1.8 2023/02/12 14:59:22 andvar Exp $ */ +/* $NetBSD: linux_types.h,v 1.9 2024/10/01 16:35:41 riastradh Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -85,7 +85,7 @@ struct linux_stat64 { unsigned int __pad0; unsigned long lst_atime; - unsigned long lst_atime_nsec; + unsigned long lst_atime_nsec; unsigned long lst_mtime; unsigned long lst_mtime_nsec; unsigned long lst_ctime; Index: src/sys/compat/linux/arch/amd64/Makefile diff -u src/sys/compat/linux/arch/amd64/Makefile:1.4 src/sys/compat/linux/arch/amd64/Makefile:1.5 --- src/sys/compat/linux/arch/amd64/Makefile:1.4 Wed May 29 18:58:00 2024 +++ src/sys/compat/linux/arch/amd64/Makefile Tue Oct 1 16:35:42 2024 @@ -1,3 +1,3 @@ -# $NetBSD: Makefile,v 1.4 2024/05/29 18:58:00 christos Exp $ +# $NetBSD: Makefile,v 1.5 2024/10/01 16:35:42 riastradh Exp $ .include "../../Makefile.inc" Index: src/sys/compat/linux/arch/amd64/linux_errno.h diff -u src/sys/compat/linux/arch/amd64/linux_errno.h:1.3 src/sys/compat/linux/arch/amd64/linux_errno.h:1.4 --- src/sys/compat/linux/arch/amd64/linux_errno.h:1.3 Tue Dec 17 22:14:24 2013 +++ src/sys/compat/linux/arch/amd64/linux_errno.h Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_errno.h,v 1.3 2013/12/17 22:14:24 njoly Exp $ */ +/* $NetBSD: linux_errno.h,v 1.4 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS Index: src/sys/compat/linux/arch/amd64/linux_mmap.h diff -u src/sys/compat/linux/arch/amd64/linux_mmap.h:1.3 src/sys/compat/linux/arch/amd64/linux_mmap.h:1.4 --- src/sys/compat/linux/arch/amd64/linux_mmap.h:1.3 Sat Mar 14 08:32:07 2015 +++ src/sys/compat/linux/arch/amd64/linux_mmap.h Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_mmap.h,v 1.3 2015/03/14 08:32:07 njoly Exp $ */ +/* $NetBSD: linux_mmap.h,v 1.4 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS Index: src/sys/compat/linux/arch/amd64/linux_socket.h diff -u src/sys/compat/linux/arch/amd64/linux_socket.h:1.3 src/sys/compat/linux/arch/amd64/linux_socket.h:1.4 --- src/sys/compat/linux/arch/amd64/linux_socket.h:1.3 Sat Jan 25 13:49:27 2014 +++ src/sys/compat/linux/arch/amd64/linux_socket.h Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socket.h,v 1.3 2014/01/25 13:49:27 njoly Exp $ */ +/* $NetBSD: linux_socket.h,v 1.4 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS Index: src/sys/compat/linux/arch/amd64/linux_termios.h diff -u src/sys/compat/linux/arch/amd64/linux_termios.h:1.3 src/sys/compat/linux/arch/amd64/linux_termios.h:1.4 --- src/sys/compat/linux/arch/amd64/linux_termios.h:1.3 Sun Jun 29 08:50:09 2008 +++ src/sys/compat/linux/arch/amd64/linux_termios.h Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_termios.h,v 1.3 2008/06/29 08:50:09 njoly Exp $ */ +/* $NetBSD: linux_termios.h,v 1.4 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS @@ -59,7 +59,7 @@ #define LINUX_B230400 0010003 #define LINUX_NSPEEDS 16 -#define LINUX_NXSPEEDS 3 +#define LINUX_NXSPEEDS 3 #define LINUX_IGNBRK 0000001 #define LINUX_BRKINT 0000002 @@ -67,12 +67,12 @@ #define LINUX_PARMRK 0000010 #define LINUX_INPCK 0000020 #define LINUX_ISTRIP 0000040 -#define LINUX_INLCR 0000100 -#define LINUX_IGNCR 0000200 -#define LINUX_ICRNL 0000400 -#define LINUX_IUCLC 0001000 -#define LINUX_IXON 0002000 -#define LINUX_IXANY 0004000 +#define LINUX_INLCR 0000100 +#define LINUX_IGNCR 0000200 +#define LINUX_ICRNL 0000400 +#define LINUX_IUCLC 0001000 +#define LINUX_IXON 0002000 +#define LINUX_IXANY 0004000 #define LINUX_IXOFF 0010000 #define LINUX_IMAXBEL 0020000 #define LINUX_IUTF8 0040000 @@ -100,11 +100,11 @@ #define LINUX_ICANON 0000002 #define LINUX_XCASE 0000004 #define LINUX_ECHO 0000010 -#define LINUX_ECHOE 0000020 -#define LINUX_ECHOK 0000040 -#define LINUX_ECHONL 0000100 -#define LINUX_NOFLSH 0000200 -#define LINUX_TOSTOP 0000400 +#define LINUX_ECHOE 0000020 +#define LINUX_ECHOK 0000040 +#define LINUX_ECHONL 0000100 +#define LINUX_NOFLSH 0000200 +#define LINUX_TOSTOP 0000400 #define LINUX_ECHOCTL 0001000 #define LINUX_ECHOPRT 0002000 #define LINUX_ECHOKE 0004000 Index: src/sys/compat/linux/arch/amd64/linux_exec.h diff -u src/sys/compat/linux/arch/amd64/linux_exec.h:1.6 src/sys/compat/linux/arch/amd64/linux_exec.h:1.7 --- src/sys/compat/linux/arch/amd64/linux_exec.h:1.6 Fri Nov 26 08:56:28 2021 +++ src/sys/compat/linux/arch/amd64/linux_exec.h Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec.h,v 1.6 2021/11/26 08:56:28 ryo Exp $ */ +/* $NetBSD: linux_exec.h,v 1.7 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,12 +14,12 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR Index: src/sys/compat/linux/arch/amd64/linux_types.h diff -u src/sys/compat/linux/arch/amd64/linux_types.h:1.6 src/sys/compat/linux/arch/amd64/linux_types.h:1.7 --- src/sys/compat/linux/arch/amd64/linux_types.h:1.6 Sun Jan 11 02:45:48 2009 +++ src/sys/compat/linux/arch/amd64/linux_types.h Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_types.h,v 1.6 2009/01/11 02:45:48 christos Exp $ */ +/* $NetBSD: linux_types.h,v 1.7 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS Index: src/sys/compat/linux/arch/amd64/linux_exec_machdep.c diff -u src/sys/compat/linux/arch/amd64/linux_exec_machdep.c:1.24 src/sys/compat/linux/arch/amd64/linux_exec_machdep.c:1.25 --- src/sys/compat/linux/arch/amd64/linux_exec_machdep.c:1.24 Sat Sep 5 16:30:10 2020 +++ src/sys/compat/linux/arch/amd64/linux_exec_machdep.c Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec_machdep.c,v 1.24 2020/09/05 16:30:10 riastradh Exp $ */ +/* $NetBSD: linux_exec_machdep.c,v 1.25 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.24 2020/09/05 16:30:10 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.25 2024/10/01 16:35:42 riastradh Exp $"); #define ELFSIZE 64 @@ -210,7 +210,7 @@ ELFNAME2(linux,copyargs)(struct lwp *l, esd.ai[i++].a_v = kauth_cred_getgid(l->l_cred); esd.ai[i].a_type = LINUX_AT_EUID; - esd.ai[i++].a_v = ((vap->va_mode & S_ISUID) ? + esd.ai[i++].a_v = ((vap->va_mode & S_ISUID) ? vap->va_uid : kauth_cred_geteuid(l->l_cred)); esd.ai[i].a_type = LINUX_AT_UID; @@ -234,7 +234,7 @@ ELFNAME2(linux,copyargs)(struct lwp *l, KASSERT(i == LINUX_ELF_AUX_ENTRIES); - strcpy(esd.hw_platform, LINUX_PLATFORM); + strcpy(esd.hw_platform, LINUX_PLATFORM); exec_free_emul_arg(pack); Index: src/sys/compat/linux/arch/amd64/linux_fcntl.h diff -u src/sys/compat/linux/arch/amd64/linux_fcntl.h:1.5 src/sys/compat/linux/arch/amd64/linux_fcntl.h:1.6 --- src/sys/compat/linux/arch/amd64/linux_fcntl.h:1.5 Wed Jun 25 16:30:42 2014 +++ src/sys/compat/linux/arch/amd64/linux_fcntl.h Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_fcntl.h,v 1.5 2014/06/25 16:30:42 njoly Exp $ */ +/* $NetBSD: linux_fcntl.h,v 1.6 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS @@ -63,7 +63,7 @@ #define LINUX_F_SETFD 2 #define LINUX_F_GETFL 3 #define LINUX_F_SETFL 4 -#define LINUX_F_GETLK 5 +#define LINUX_F_GETLK 5 #define LINUX_F_SETLK 6 #define LINUX_F_SETLKW 7 #define LINUX_F_SETOWN 8 @@ -73,7 +73,7 @@ #define LINUX_F_SETLKW64 14 #define LINUX_F_RDLCK 0 -#define LINUX_F_WRLCK 1 +#define LINUX_F_WRLCK 1 #define LINUX_F_UNLCK 2 #endif /* !_AMD64_LINUX_FCNTL_H */ Index: src/sys/compat/linux/arch/amd64/linux_signal.h diff -u src/sys/compat/linux/arch/amd64/linux_signal.h:1.5 src/sys/compat/linux/arch/amd64/linux_signal.h:1.6 --- src/sys/compat/linux/arch/amd64/linux_signal.h:1.5 Sat Nov 14 13:29:35 2015 +++ src/sys/compat/linux/arch/amd64/linux_signal.h Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_signal.h,v 1.5 2015/11/14 13:29:35 christos Exp $ */ +/* $NetBSD: linux_signal.h,v 1.6 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS @@ -102,7 +102,7 @@ typedef struct { typedef void (*linux_handler_t)(int); /* struct old_sigaction32 in Linux; uses a 32 bit pointer for handlers */ -struct linux_compat_old_sigaction { +struct linux_compat_old_sigaction { linux_handler_t linux_sa_handler; linux_old_sigset_t linux_sa_mask; unsigned int linux_sa_flags; @@ -110,7 +110,7 @@ struct linux_compat_old_sigaction { }; /* Dummy declaration to avoid errors, unused */ -struct linux_old_sigaction { +struct linux_old_sigaction { linux_handler_t linux_sa_handler; unsigned long linux_sa_flags; void (*linux_sa_restorer)(void); Index: src/sys/compat/linux/arch/amd64/linux_ioctl.h diff -u src/sys/compat/linux/arch/amd64/linux_ioctl.h:1.2 src/sys/compat/linux/arch/amd64/linux_ioctl.h:1.3 --- src/sys/compat/linux/arch/amd64/linux_ioctl.h:1.2 Sun Dec 11 12:20:14 2005 +++ src/sys/compat/linux/arch/amd64/linux_ioctl.h Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ioctl.h,v 1.2 2005/12/11 12:20:14 christos Exp $ */ +/* $NetBSD: linux_ioctl.h,v 1.3 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS Index: src/sys/compat/linux/arch/amd64/linux_prctl.h diff -u src/sys/compat/linux/arch/amd64/linux_prctl.h:1.2 src/sys/compat/linux/arch/amd64/linux_prctl.h:1.3 --- src/sys/compat/linux/arch/amd64/linux_prctl.h:1.2 Sun Dec 11 12:20:14 2005 +++ src/sys/compat/linux/arch/amd64/linux_prctl.h Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_prctl.h,v 1.2 2005/12/11 12:20:14 christos Exp $ */ +/* $NetBSD: linux_prctl.h,v 1.3 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS Index: src/sys/compat/linux/arch/amd64/linux_sigarray.c diff -u src/sys/compat/linux/arch/amd64/linux_sigarray.c:1.2 src/sys/compat/linux/arch/amd64/linux_sigarray.c:1.3 --- src/sys/compat/linux/arch/amd64/linux_sigarray.c:1.2 Sun Dec 11 12:20:14 2005 +++ src/sys/compat/linux/arch/amd64/linux_sigarray.c Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sigarray.c,v 1.2 2005/12/11 12:20:14 christos Exp $ */ +/* $NetBSD: linux_sigarray.c,v 1.3 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -__KERNEL_RCSID(1, "$NetBSD: linux_sigarray.c,v 1.2 2005/12/11 12:20:14 christos Exp $"); +__KERNEL_RCSID(1, "$NetBSD: linux_sigarray.c,v 1.3 2024/10/01 16:35:42 riastradh Exp $"); const int linux_to_native_signo[LINUX__NSIG] = { 0, /* 0 */ Index: src/sys/compat/linux/arch/amd64/linux_machdep.c diff -u src/sys/compat/linux/arch/amd64/linux_machdep.c:1.61 src/sys/compat/linux/arch/amd64/linux_machdep.c:1.62 --- src/sys/compat/linux/arch/amd64/linux_machdep.c:1.61 Wed Oct 27 16:40:04 2021 +++ src/sys/compat/linux/arch/amd64/linux_machdep.c Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.61 2021/10/27 16:40:04 thorpej Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.62 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.61 2021/10/27 16:40:04 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.62 2024/10/01 16:35:42 riastradh Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machde #include <machine/cpufunc.h> #include <x86/include/sysarch.h> -/* +/* * To see whether wscons is configured (for virtual console ioctl calls). */ #if defined(_KERNEL_OPT) @@ -147,7 +147,7 @@ linux_sendsig(const ksiginfo_t *ksi, con onstack = (l->l_sigstk.ss_flags & (SS_DISABLE | SS_ONSTACK)) == 0 && (SIGACTION(p, sig).sa_flags & SA_ONSTACK) != 0; - + /* Allocate space for the signal handler context. */ if (onstack) sp = ((char *)l->l_sigstk.ss_sp + @@ -159,8 +159,8 @@ linux_sendsig(const ksiginfo_t *ksi, con sp = (char *) (((long)sp - sizeof (*fpsp)) & ~0xfUL); fpsp = (struct linux__fpstate *)sp; - /* - * Populate the rt_sigframe + /* + * Populate the rt_sigframe */ sp = (char *) ((((long)sp - sizeof(struct linux_rt_sigframe)) & ~0xfUL) - 8); @@ -168,13 +168,13 @@ linux_sendsig(const ksiginfo_t *ksi, con memset(&sigframe, 0, sizeof(sigframe)); if (ps->sa_sigdesc[sig].sd_vers != __SIGTRAMP_SIGCODE_VERSION) - sigframe.pretcode = + sigframe.pretcode = (char *)(u_long)ps->sa_sigdesc[sig].sd_tramp; else sigframe.pretcode = NULL; - /* - * The user context + /* + * The user context */ sigframe.uc.luc_flags = 0; sigframe.uc.luc_link = NULL; @@ -221,8 +221,8 @@ linux_sendsig(const ksiginfo_t *ksi, con mutex_exit(p->p_lock); error = 0; - /* - * Save FPU state, if any + /* + * Save FPU state, if any */ if (fpsp != NULL) { size_t fp_size = sizeof fpregs; @@ -335,7 +335,7 @@ linux_sys_rt_sigreturn(struct lwp *l, co mctx = (mcontext_t *)&uctx.uc_mcontext; fxarea = (struct fxsave *)&mctx->__fpregs; - /* + /* * Set the flags. Linux always have CPU, stack and signal state, * FPU is optional. uc_flags is not used to tell what we have. */ @@ -345,7 +345,7 @@ linux_sys_rt_sigreturn(struct lwp *l, co uctx.uc_link = NULL; /* - * Signal set + * Signal set */ linux_to_native_sigset(&uctx.uc_sigmask, &luctx->luc_sigmask); @@ -380,7 +380,7 @@ linux_sys_rt_sigreturn(struct lwp *l, co mctx->__gregs[_REG_SS] = tf->tf_ss & 0xFFFF; /* - * FPU state + * FPU state */ if (lsigctx->fpstate != NULL) { /* Both structures match the fxstate data */ @@ -442,7 +442,7 @@ linux_sys_arch_prctl(struct lwp *l, default: #ifdef DEBUG_LINUX - printf("linux_sys_arch_prctl: unexpected code %d\n", + printf("linux_sys_arch_prctl: unexpected code %d\n", SCARG(uap, code)); #endif return EINVAL; Index: src/sys/compat/linux/arch/amd64/linux_machdep.h diff -u src/sys/compat/linux/arch/amd64/linux_machdep.h:1.14 src/sys/compat/linux/arch/amd64/linux_machdep.h:1.15 --- src/sys/compat/linux/arch/amd64/linux_machdep.h:1.14 Fri Feb 7 22:40:22 2014 +++ src/sys/compat/linux/arch/amd64/linux_machdep.h Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.h,v 1.14 2014/02/07 22:40:22 dsl Exp $ */ +/* $NetBSD: linux_machdep.h,v 1.15 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS Index: src/sys/compat/linux/arch/amd64/linux_siginfo.h diff -u src/sys/compat/linux/arch/amd64/linux_siginfo.h:1.7 src/sys/compat/linux/arch/amd64/linux_siginfo.h:1.8 --- src/sys/compat/linux/arch/amd64/linux_siginfo.h:1.7 Fri Nov 18 04:07:43 2011 +++ src/sys/compat/linux/arch/amd64/linux_siginfo.h Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_siginfo.h,v 1.7 2011/11/18 04:07:43 christos Exp $ */ +/* $NetBSD: linux_siginfo.h,v 1.8 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS Index: src/sys/compat/linux/arch/m68k/linux_machdep.c diff -u src/sys/compat/linux/arch/m68k/linux_machdep.c:1.44 src/sys/compat/linux/arch/m68k/linux_machdep.c:1.45 --- src/sys/compat/linux/arch/m68k/linux_machdep.c:1.44 Sun Aug 7 20:14:01 2022 +++ src/sys/compat/linux/arch/m68k/linux_machdep.c Tue Oct 1 16:35:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.44 2022/08/07 20:14:01 tsutsui Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.45 2024/10/01 16:35:42 riastradh Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.44 2022/08/07 20:14:01 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.45 2024/10/01 16:35:42 riastradh Exp $"); #define COMPAT_LINUX 1 @@ -680,7 +680,7 @@ linux_sys_rt_sigreturn(struct lwp *l, co /* Grab whole of the ucontext. */ if (copyin(ucp, &tuc, sizeof tuc)) { -bad: +bad: mutex_enter(p->p_lock); sigexit(l, SIGSEGV); }