Module Name: src
Committed By: riastradh
Date: Tue Oct 1 16:41:29 UTC 2024
Modified Files:
src/sys/compat/linux/common: linux_cdrom.c linux_file.c linux_inotify.c
linux_ioctl.c linux_ioctl.h linux_limit.h linux_misc.c linux_misc.h
linux_mod.c linux_msg.h linux_mtio.c linux_prctl.h linux_sched.c
linux_signal.c linux_socket.c linux_sockio.h
Log Message:
sys/compat/linux/common: Nix trailing whitespace, and one blank line.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/compat/linux/common/linux_cdrom.c
cvs rdiff -u -r1.125 -r1.126 src/sys/compat/linux/common/linux_file.c
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/linux/common/linux_inotify.c
cvs rdiff -u -r1.59 -r1.60 src/sys/compat/linux/common/linux_ioctl.c
cvs rdiff -u -r1.29 -r1.30 src/sys/compat/linux/common/linux_ioctl.h
cvs rdiff -u -r1.9 -r1.10 src/sys/compat/linux/common/linux_limit.h
cvs rdiff -u -r1.266 -r1.267 src/sys/compat/linux/common/linux_misc.c
cvs rdiff -u -r1.33 -r1.34 src/sys/compat/linux/common/linux_misc.h
cvs rdiff -u -r1.16 -r1.17 src/sys/compat/linux/common/linux_mod.c
cvs rdiff -u -r1.13 -r1.14 src/sys/compat/linux/common/linux_msg.h
cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux/common/linux_mtio.c
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/linux/common/linux_prctl.h
cvs rdiff -u -r1.81 -r1.82 src/sys/compat/linux/common/linux_sched.c
cvs rdiff -u -r1.89 -r1.90 src/sys/compat/linux/common/linux_signal.c
cvs rdiff -u -r1.155 -r1.156 src/sys/compat/linux/common/linux_socket.c
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/linux/common/linux_sockio.h
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/common/linux_cdrom.c
diff -u src/sys/compat/linux/common/linux_cdrom.c:1.28 src/sys/compat/linux/common/linux_cdrom.c:1.29
--- src/sys/compat/linux/common/linux_cdrom.c:1.28 Tue Sep 7 11:43:04 2021
+++ src/sys/compat/linux/common/linux_cdrom.c Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_cdrom.c,v 1.28 2021/09/07 11:43:04 riastradh Exp $ */
+/* $NetBSD: linux_cdrom.c,v 1.29 2024/10/01 16:41:29 riastradh Exp $ */
/*
* Copyright (c) 1997, 2008 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_cdrom.c,v 1.28 2021/09/07 11:43:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_cdrom.c,v 1.29 2024/10/01 16:41:29 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,7 +98,7 @@ linux_ioctl_cdrom(struct lwp *l, const s
file_t *fp;
int (*ioctlf)(file_t *, u_long, void *);
- union {
+ union {
struct linux_cdrom_blk ll_blk;
struct linux_cdrom_msf ll_msf;
struct linux_cdrom_ti ll_ti;
Index: src/sys/compat/linux/common/linux_file.c
diff -u src/sys/compat/linux/common/linux_file.c:1.125 src/sys/compat/linux/common/linux_file.c:1.126
--- src/sys/compat/linux/common/linux_file.c:1.125 Sat Sep 28 19:35:56 2024
+++ src/sys/compat/linux/common/linux_file.c Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_file.c,v 1.125 2024/09/28 19:35:56 christos Exp $ */
+/* $NetBSD: linux_file.c,v 1.126 2024/10/01 16:41:29 riastradh Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.125 2024/09/28 19:35:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.126 2024/10/01 16:41:29 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -156,7 +156,7 @@ linux_hilo_to_off_t(unsigned long hi, un
* argument regardless, the "lo" argument has all the bits in
* this case.
*/
- (void) hi;
+ (void) hi;
return (off_t)lo;
#else
return (((off_t)hi) << 32) | lo;
@@ -928,7 +928,7 @@ linux_sys_faccessat2(lwp_t *l, const str
}
-int
+int
linux_sys_sync_file_range(lwp_t *l,
const struct linux_sys_sync_file_range_args *uap, register_t *retval)
{
@@ -938,7 +938,7 @@ linux_sys_sync_file_range(lwp_t *l,
syscallarg(off_t) nbytes;
syscallarg(unsigned int) flags;
} */
-
+
struct sys_fsync_range_args ua;
if (SCARG(uap, offset) < 0 || SCARG(uap, nbytes) < 0 ||
@@ -955,13 +955,13 @@ linux_sys_sync_file_range(lwp_t *l,
if (SCARG(&ua, length) != 0) {
/* Round up length to nbytes+offset to page boundary */
SCARG(&ua, length) = roundup(SCARG(uap, nbytes)
- + SCARG(uap, offset) - SCARG(&ua, start), PAGE_SIZE);
+ + SCARG(uap, offset) - SCARG(&ua, start), PAGE_SIZE);
}
-
+
return sys_fsync_range(l, &ua, retval);
}
-int
+int
linux_sys_syncfs(lwp_t *l, const struct linux_sys_syncfs_args *uap,
register_t *retval)
{
@@ -974,15 +974,15 @@ linux_sys_syncfs(lwp_t *l, const struct
file_t *fp;
int error, fd;
fd = SCARG(uap, fd);
-
+
/* Get file pointer */
if ((error = fd_getvnode(fd, &fp)) != 0)
return error;
-
+
/* Get vnode and mount point */
vp = fp->f_vnode;
mp = vp->v_mount;
-
+
mutex_enter(mp->mnt_updating);
if ((mp->mnt_flag & MNT_RDONLY) == 0) {
int asyncflag = mp->mnt_flag & MNT_ASYNC;
@@ -992,7 +992,7 @@ linux_sys_syncfs(lwp_t *l, const struct
mp->mnt_flag |= MNT_ASYNC;
}
mutex_exit(mp->mnt_updating);
-
+
/* Cleanup vnode and file pointer */
vrele(vp);
fd_putfile(fd);
@@ -1000,7 +1000,7 @@ linux_sys_syncfs(lwp_t *l, const struct
}
-int
+int
linux_sys_renameat2(struct lwp *l, const struct linux_sys_renameat2_args *uap,
register_t *retval)
{
@@ -1024,13 +1024,13 @@ linux_sys_renameat2(struct lwp *l, const
if (flags != 0) {
if (flags & ~LINUX_RENAME_ALL)
return EINVAL;
- if ((flags & LINUX_RENAME_EXCHANGE) != 0 &&
+ if ((flags & LINUX_RENAME_EXCHANGE) != 0 &&
(flags & (LINUX_RENAME_NOREPLACE | LINUX_RENAME_WHITEOUT))
!= 0)
return EINVAL;
/*
* Suppoting renameat2 flags without support from file systems
- * becomes a messy affair cause of locks and how VOP_RENAME
+ * becomes a messy affair cause of locks and how VOP_RENAME
* protocol is implemented. So, return EOPNOTSUPP for now.
*/
return EOPNOTSUPP;
@@ -1079,7 +1079,7 @@ int linux_sys_copy_file_range(lwp_t *l,
DPRINTF("%s: unsupported flags %#x\n", __func__, flags);
return EINVAL;
}
-
+
fd_in = SCARG(uap, fd_in);
fd_out = SCARG(uap, fd_out);
error = fd_getvnode(fd_in, &fp_in);
@@ -1092,21 +1092,21 @@ int linux_sys_copy_file_range(lwp_t *l,
fd_putfile(fd_in);
return error;
}
-
+
invp = fp_in->f_vnode;
outvp = fp_out->f_vnode;
/* Get attributes of input and output files */
VOP_GETATTR(invp, &vattr_in, l->l_cred);
VOP_GETATTR(outvp, &vattr_out, l->l_cred);
-
+
/* Check if input and output files are regular files */
if (vattr_in.va_type == VDIR || vattr_out.va_type == VDIR) {
error = EISDIR;
DPRINTF("%s: Input or output is a directory\n", __func__);
goto out;
- }
- if ((SCARG(uap, off_in) != NULL && *SCARG(uap, off_in) < 0) ||
+ }
+ if ((SCARG(uap, off_in) != NULL && *SCARG(uap, off_in) < 0) ||
(SCARG(uap, off_out) != NULL && *SCARG(uap, off_out) < 0) ||
vattr_in.va_type != VREG || vattr_out.va_type != VREG)
{
@@ -1138,7 +1138,7 @@ int linux_sys_copy_file_range(lwp_t *l,
}
have_off_out = true;
}
-
+
off_t new_size = off_out + len;
if (new_size < 0) {
DPRINTF("%s: New size is greater than OFF_MAX\n", __func__);
@@ -1166,7 +1166,7 @@ int linux_sys_copy_file_range(lwp_t *l,
while (bytes_left > 0) {
to_copy = MIN(bytes_left, LINUX_COPY_FILE_RANGE_MAX_CHUNK);
-
+
/* Lock the input vnode for reading */
vn_lock(fp_in->f_vnode, LK_SHARED | LK_RETRY);
/* Set up iovec and uio for reading */
@@ -1233,7 +1233,7 @@ int linux_sys_copy_file_range(lwp_t *l,
if (have_off_in) {
/* Adjust user space offset */
- error = copyout(&off_in, SCARG(uap, off_in), sizeof(off_t));
+ error = copyout(&off_in, SCARG(uap, off_in), sizeof(off_t));
if (error) {
DPRINTF("%s: Error adjusting user space offset\n",
__func__);
@@ -1243,7 +1243,7 @@ int linux_sys_copy_file_range(lwp_t *l,
if (have_off_out) {
/* Adjust user space offset */
- error = copyout(&off_out, SCARG(uap, off_out), sizeof(off_t));
+ error = copyout(&off_out, SCARG(uap, off_out), sizeof(off_t));
if (error) {
DPRINTF("%s: Error adjusting user space offset\n",
__func__);
Index: src/sys/compat/linux/common/linux_inotify.c
diff -u src/sys/compat/linux/common/linux_inotify.c:1.6 src/sys/compat/linux/common/linux_inotify.c:1.7
--- src/sys/compat/linux/common/linux_inotify.c:1.6 Fri Feb 9 22:08:34 2024
+++ src/sys/compat/linux/common/linux_inotify.c Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_inotify.c,v 1.6 2024/02/09 22:08:34 andvar Exp $ */
+/* $NetBSD: linux_inotify.c,v 1.7 2024/10/01 16:41:29 riastradh Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_inotify.c,v 1.6 2024/02/09 22:08:34 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_inotify.c,v 1.7 2024/10/01 16:41:29 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -886,7 +886,7 @@ leave:
return idep;
}
-static size_t
+static size_t
find_entry(struct inotify_dir_entries *i1, struct inotify_dir_entries *i2)
{
for (size_t i = 0; i < i2->ide_count; i++)
Index: src/sys/compat/linux/common/linux_ioctl.c
diff -u src/sys/compat/linux/common/linux_ioctl.c:1.59 src/sys/compat/linux/common/linux_ioctl.c:1.60
--- src/sys/compat/linux/common/linux_ioctl.c:1.59 Sun Sep 19 23:51:37 2021
+++ src/sys/compat/linux/common/linux_ioctl.c Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ioctl.c,v 1.59 2021/09/19 23:51:37 thorpej Exp $ */
+/* $NetBSD: linux_ioctl.c,v 1.60 2024/10/01 16:41:29 riastradh Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ioctl.c,v 1.59 2021/09/19 23:51:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ioctl.c,v 1.60 2024/10/01 16:41:29 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "sequencer.h"
@@ -209,7 +209,7 @@ linux_sys_ioctl(struct lwp *l, const str
if (error == EPASSTHROUGH) {
/*
* linux returns EINVAL or ENOTTY for not supported ioctls.
- */
+ */
error = EINVAL;
}
Index: src/sys/compat/linux/common/linux_ioctl.h
diff -u src/sys/compat/linux/common/linux_ioctl.h:1.29 src/sys/compat/linux/common/linux_ioctl.h:1.30
--- src/sys/compat/linux/common/linux_ioctl.h:1.29 Thu Sep 23 06:56:27 2021
+++ src/sys/compat/linux/common/linux_ioctl.h Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ioctl.h,v 1.29 2021/09/23 06:56:27 ryo Exp $ */
+/* $NetBSD: linux_ioctl.h,v 1.30 2024/10/01 16:41:29 riastradh Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@ int linux_ioctl_blkio(struct lwp *, cons
register_t *retval);
int linux_ioctl_sg(struct lwp *, const struct linux_sys_ioctl_args *uap,
register_t *retval);
-int linux_ioctl_mtio(struct lwp *, const struct linux_sys_ioctl_args *uap,
+int linux_ioctl_mtio(struct lwp *, const struct linux_sys_ioctl_args *uap,
register_t *retval);
__END_DECLS
#endif /* !_KERNEL */
Index: src/sys/compat/linux/common/linux_limit.h
diff -u src/sys/compat/linux/common/linux_limit.h:1.9 src/sys/compat/linux/common/linux_limit.h:1.10
--- src/sys/compat/linux/common/linux_limit.h:1.9 Sun May 12 17:23:10 2024
+++ src/sys/compat/linux/common/linux_limit.h Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_limit.h,v 1.9 2024/05/12 17:23:10 christos Exp $ */
+/* $NetBSD: linux_limit.h,v 1.10 2024/10/01 16:41:29 riastradh Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@ static int linux_to_bsd_limit(int);
static int
linux_to_bsd_limit(int lim)
-{
+{
switch (lim) {
case LINUX_RLIMIT_CPU:
return RLIMIT_CPU;
@@ -103,7 +103,7 @@ linux_to_bsd_limit(int lim)
default:
return -EINVAL;
}
-}
+}
#endif /* _LINUX_LIMIT_H_ */
Index: src/sys/compat/linux/common/linux_misc.c
diff -u src/sys/compat/linux/common/linux_misc.c:1.266 src/sys/compat/linux/common/linux_misc.c:1.267
--- src/sys/compat/linux/common/linux_misc.c:1.266 Sun Sep 29 00:09:52 2024
+++ src/sys/compat/linux/common/linux_misc.c Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.c,v 1.266 2024/09/29 00:09:52 christos Exp $ */
+/* $NetBSD: linux_misc.c,v 1.267 2024/10/01 16:41:29 riastradh Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.266 2024/09/29 00:09:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.267 2024/10/01 16:41:29 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1161,7 +1161,7 @@ linux_sys_personality(struct lwp *l, con
retval[0] = led->led_personality;
return 0;
}
-
+
switch (per & LINUX_PER_MASK) {
case LINUX_PER_LINUX:
case LINUX_PER_LINUX32:
@@ -1308,7 +1308,7 @@ linux_sys_ptrace(struct lwp *l, const st
case LINUX_PTRACE_PEEKTEXT:
case LINUX_PTRACE_PEEKDATA:
error = copyout (retval,
- (void *)SCARG(uap, data),
+ (void *)SCARG(uap, data),
sizeof *retval);
*retval = SCARG(uap, data);
break;
@@ -1457,7 +1457,7 @@ linux_sys_sysinfo(struct lwp *l, const s
si.sharedram = 0; /* XXX */
si.bufferram = (u_long)(filepg * uvmexp.pagesize);
si.totalswap = (u_long)uvmexp.swpages * uvmexp.pagesize;
- si.freeswap =
+ si.freeswap =
(u_long)(uvmexp.swpages - uvmexp.swpginuse) * uvmexp.pagesize;
si.procs = atomic_load_relaxed(&nprocs);
@@ -1685,7 +1685,7 @@ linux_sys_futex(struct lwp *l, const str
const int op = (SCARG(uap, op) & FUTEX_CMD_MASK);
if ((op == FUTEX_WAIT || op == FUTEX_WAIT_BITSET) &&
SCARG(uap, timeout) != NULL) {
- if ((error = copyin(SCARG(uap, timeout),
+ if ((error = copyin(SCARG(uap, timeout),
<s, sizeof(lts))) != 0) {
return error;
}
@@ -2160,7 +2160,7 @@ linux_sys_getcpu(lwp_t *l, const struct
return error;
}
-
+
// TO-DO: Test on a NUMA machine if the node_id returned is correct
if (SCARG(uap, node)) {
u_int node_id = l->l_cpu->ci_data.cpu_numa_id;
Index: src/sys/compat/linux/common/linux_misc.h
diff -u src/sys/compat/linux/common/linux_misc.h:1.33 src/sys/compat/linux/common/linux_misc.h:1.34
--- src/sys/compat/linux/common/linux_misc.h:1.33 Sat Jun 29 13:46:10 2024
+++ src/sys/compat/linux/common/linux_misc.h Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.h,v 1.33 2024/06/29 13:46:10 christos Exp $ */
+/* $NetBSD: linux_misc.h,v 1.34 2024/10/01 16:41:29 riastradh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -156,7 +156,7 @@ extern const int linux_fstypes_cnt;
/* Personality flags. */
#define LINUX_PER_ADDR_NO_RANDOMIZE 0x00040000
-/*
+/*
* Convert POSIX_FADV_* constants from Linux to NetBSD
* (it's f(x)=x everywhere except S390)
*/
Index: src/sys/compat/linux/common/linux_mod.c
diff -u src/sys/compat/linux/common/linux_mod.c:1.16 src/sys/compat/linux/common/linux_mod.c:1.17
--- src/sys/compat/linux/common/linux_mod.c:1.16 Mon Jul 1 01:35:53 2024
+++ src/sys/compat/linux/common/linux_mod.c Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_mod.c,v 1.16 2024/07/01 01:35:53 christos Exp $ */
+/* $NetBSD: linux_mod.c,v 1.17 2024/10/01 16:41:29 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.16 2024/07/01 01:35:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.17 2024/10/01 16:41:29 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -145,7 +145,7 @@ linux_sysctl_enable(SYSCTLFN_ARGS)
error = exec_add(linux_execsw, __arraycount(linux_execsw));
else if (val == 0)
error = exec_remove(linux_execsw, __arraycount(linux_execsw));
- else
+ else
error = EINVAL;
if (error)
Index: src/sys/compat/linux/common/linux_msg.h
diff -u src/sys/compat/linux/common/linux_msg.h:1.13 src/sys/compat/linux/common/linux_msg.h:1.14
--- src/sys/compat/linux/common/linux_msg.h:1.13 Wed Nov 18 15:19:24 2009
+++ src/sys/compat/linux/common/linux_msg.h Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_msg.h,v 1.13 2009/11/18 15:19:24 njoly Exp $ */
+/* $NetBSD: linux_msg.h,v 1.14 2024/10/01 16:41:29 riastradh Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -75,7 +75,6 @@ struct linux_msqid64_ds {
int l_msg_lrpid;
ulong l___unused4;
ulong l___unused5;
-
};
#define LINUX_MSG_NOERROR 0x1000
Index: src/sys/compat/linux/common/linux_mtio.c
diff -u src/sys/compat/linux/common/linux_mtio.c:1.8 src/sys/compat/linux/common/linux_mtio.c:1.9
--- src/sys/compat/linux/common/linux_mtio.c:1.8 Tue Sep 7 11:43:04 2021
+++ src/sys/compat/linux/common/linux_mtio.c Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_mtio.c,v 1.8 2021/09/07 11:43:04 riastradh Exp $ */
+/* $NetBSD: linux_mtio.c,v 1.9 2024/10/01 16:41:29 riastradh Exp $ */
/*
* Copyright (c) 2005 Soren S. Jorvang. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_mtio.c,v 1.8 2021/09/07 11:43:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_mtio.c,v 1.9 2024/10/01 16:41:29 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,7 +100,7 @@ linux_ioctl_mtio(struct lwp *l, const st
error = EINVAL;
break;
}
-
+
mt.mt_op = mtop_map[i].op;
mt.mt_count = lmtop.mt_count;
error = ioctlf(fp, MTIOCTOP, &mt);
Index: src/sys/compat/linux/common/linux_prctl.h
diff -u src/sys/compat/linux/common/linux_prctl.h:1.4 src/sys/compat/linux/common/linux_prctl.h:1.5
--- src/sys/compat/linux/common/linux_prctl.h:1.4 Fri Feb 9 22:08:34 2024
+++ src/sys/compat/linux/common/linux_prctl.h Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_prctl.h,v 1.4 2024/02/09 22:08:34 andvar Exp $ */
+/* $NetBSD: linux_prctl.h,v 1.5 2024/10/01 16:41:29 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/common/linux_sched.c
diff -u src/sys/compat/linux/common/linux_sched.c:1.81 src/sys/compat/linux/common/linux_sched.c:1.82
--- src/sys/compat/linux/common/linux_sched.c:1.81 Mon Sep 30 01:26:47 2024
+++ src/sys/compat/linux/common/linux_sched.c Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sched.c,v 1.81 2024/09/30 01:26:47 kre Exp $ */
+/* $NetBSD: linux_sched.c,v 1.82 2024/10/01 16:41:29 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2019 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.81 2024/09/30 01:26:47 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.82 2024/10/01 16:41:29 riastradh Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -208,7 +208,7 @@ linux_sys_clone3(struct lwp *l, const st
return EINVAL;
}
#endif
-
+
if (cl_args.stack == 0 && cl_args.stack_size != 0) {
DPRINTF("%s: Stack is NULL but stack size is not 0\n",
__func__);
@@ -224,7 +224,7 @@ linux_sys_clone3(struct lwp *l, const st
#if 0
int sig = cl_args.exit_signal & LINUX_CLONE_CSIGNAL;
#endif
- // XXX: Pidfd member handling
+ // XXX: Pidfd member handling
// XXX: we don't have cgroups
// XXX: what to do with tid_set and tid_set_size
// XXX: clone3 has stacksize, instead implement clone as a clone3
@@ -362,7 +362,7 @@ sched_linux2native(int linux_policy, str
if (linux_params != NULL) {
int prio = linux_params->sched_priority;
-
+
KASSERT(native_params != NULL);
if (linux_policy == LINUX_SCHED_OTHER) {
Index: src/sys/compat/linux/common/linux_signal.c
diff -u src/sys/compat/linux/common/linux_signal.c:1.89 src/sys/compat/linux/common/linux_signal.c:1.90
--- src/sys/compat/linux/common/linux_signal.c:1.89 Fri Aug 18 19:41:19 2023
+++ src/sys/compat/linux/common/linux_signal.c Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_signal.c,v 1.89 2023/08/18 19:41:19 christos Exp $ */
+/* $NetBSD: linux_signal.c,v 1.90 2024/10/01 16:41:29 riastradh Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.89 2023/08/18 19:41:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.90 2024/10/01 16:41:29 riastradh Exp $");
#define COMPAT_LINUX 1
@@ -579,7 +579,7 @@ fetchss(const void *u, void *s, size_t l
{
int error;
linux_sigset_t lss;
-
+
if ((error = copyin(u, &lss, sizeof(lss))) != 0)
return error;
@@ -592,7 +592,7 @@ fetchts(const void *u, void *s, size_t l
{
int error;
struct linux_timespec lts;
-
+
if ((error = copyin(u, <s, sizeof(lts))) != 0)
return error;
Index: src/sys/compat/linux/common/linux_socket.c
diff -u src/sys/compat/linux/common/linux_socket.c:1.155 src/sys/compat/linux/common/linux_socket.c:1.156
--- src/sys/compat/linux/common/linux_socket.c:1.155 Sat Dec 24 15:23:02 2022
+++ src/sys/compat/linux/common/linux_socket.c Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_socket.c,v 1.155 2022/12/24 15:23:02 andvar Exp $ */
+/* $NetBSD: linux_socket.c,v 1.156 2024/10/01 16:41:29 riastradh Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.155 2022/12/24 15:23:02 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.156 2024/10/01 16:41:29 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -599,7 +599,7 @@ linux_sys_sendmsg(struct lwp *l, const s
cmsg->cmsg_type = l_cmsg.cmsg_type;
/* Zero area between header and data */
- memset(cmsg + 1, 0,
+ memset(cmsg + 1, 0,
CMSG_ALIGN(sizeof(*cmsg)) - sizeof(*cmsg));
/* Copyin the data */
Index: src/sys/compat/linux/common/linux_sockio.h
diff -u src/sys/compat/linux/common/linux_sockio.h:1.19 src/sys/compat/linux/common/linux_sockio.h:1.20
--- src/sys/compat/linux/common/linux_sockio.h:1.19 Fri Jan 11 19:01:36 2013
+++ src/sys/compat/linux/common/linux_sockio.h Tue Oct 1 16:41:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sockio.h,v 1.19 2013/01/11 19:01:36 christos Exp $ */
+/* $NetBSD: linux_sockio.h,v 1.20 2024/10/01 16:41:29 riastradh Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
struct linux_ifmap {
unsigned long mem_start;
unsigned long mem_end;
- unsigned short base_addr;
+ unsigned short base_addr;
unsigned char irq;
unsigned char dma;
unsigned char port;
