CVS commit: src/sys/modules/compat_100
Module Name:src Committed By: mlelstv Date: Wed May 29 06:47:23 UTC 2024 Modified Files: src/sys/modules/compat_100: Makefile Log Message: The module also needs the syscall for old dup3. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/compat_100/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/compat_100/Makefile diff -u src/sys/modules/compat_100/Makefile:1.2 src/sys/modules/compat_100/Makefile:1.3 --- src/sys/modules/compat_100/Makefile:1.2 Tue Sep 5 14:49:46 2023 +++ src/sys/modules/compat_100/Makefile Wed May 29 06:47:23 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2023/09/05 14:49:46 christos Exp $ +# $NetBSD: Makefile,v 1.3 2024/05/29 06:47:23 mlelstv Exp $ .include "../Makefile.inc" @@ -8,6 +8,6 @@ KMOD= compat_100 CPPFLAGS+= -DCOMPAT_100 -SRCS+= compat_100_mod.c kern_event_100.c +SRCS+= compat_100_mod.c kern_event_100.c sys_descrip_100.c .include
CVS commit: src/sys/modules/compat_100
Module Name:src Committed By: mlelstv Date: Wed May 29 06:47:23 UTC 2024 Modified Files: src/sys/modules/compat_100: Makefile Log Message: The module also needs the syscall for old dup3. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/compat_100/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/ffs
Module Name:src
Committed By: pgoyette
Date: Thu May 23 06:10:04 UTC 2024
Modified Files:
src/sys/modules/ffs: Makefile
Log Message:
Get the case right when reverting local changes
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/modules/ffs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.26 src/sys/modules/ffs/Makefile:1.27
--- src/sys/modules/ffs/Makefile:1.26 Wed May 22 17:20:45 2024
+++ src/sys/modules/ffs/Makefile Thu May 23 06:10:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2024/05/22 17:20:45 pgoyette Exp $
+# $NetBSD: Makefile,v 1.27 2024/05/23 06:10:03 pgoyette Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
KMOD= ffs
CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
-CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACl -DUFS_DIRHASH
+CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -DUFS_DIRHASH
CWARNFLAGS.clang= -Wno-conversion
COPTS.ffs_appleufs.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
CVS commit: src/sys/modules/ffs
Module Name:src Committed By: pgoyette Date: Thu May 23 06:10:04 UTC 2024 Modified Files: src/sys/modules/ffs: Makefile Log Message: Get the case right when reverting local changes To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/modules/ffs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src Committed By: pgoyette Date: Wed May 22 17:20:45 UTC 2024 Modified Files: src/sys/modules/ffs: Makefile src/sys/modules/ufs: Makefile Log Message: Remove some more accidental local changes To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/modules/ffs/Makefile cvs rdiff -u -r1.9 -r1.10 src/sys/modules/ufs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src
Committed By: pgoyette
Date: Wed May 22 17:20:45 UTC 2024
Modified Files:
src/sys/modules/ffs: Makefile
src/sys/modules/ufs: Makefile
Log Message:
Remove some more accidental local changes
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/modules/ffs/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/modules/ufs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.25 src/sys/modules/ffs/Makefile:1.26
--- src/sys/modules/ffs/Makefile:1.25 Mon May 20 18:14:38 2024
+++ src/sys/modules/ffs/Makefile Wed May 22 17:20:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/05/20 18:14:38 pgoyette Exp $
+# $NetBSD: Makefile,v 1.26 2024/05/22 17:20:45 pgoyette Exp $
.include "../Makefile.inc"
@@ -6,21 +6,15 @@
KMOD= ffs
CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
-CPPFLAGS+= -DUFS_DIRHASH
+CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACl -DUFS_DIRHASH
CWARNFLAGS.clang= -Wno-conversion
COPTS.ffs_appleufs.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
SRCS+= ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_subr.c ffs_tables.c \
- ffs_vfsops.c ffs_vnops.c ffs_snapshot.c \
+ ffs_vfsops.c ffs_vnops.c ffs_snapshot.c ffs_extattr.c \
ffs_bswap.c ffs_wapbl.c ffs_appleufs.c ffs_quota2.c
-#CPPFLAGS+= -DUFS_EXTATTR
-#SRCS+= ffs_extattr.c
-
-#CPPFLAGS+= -DUFS_ACL
-#SRCS+= ufs_acl.c
-
WARNS= 3
.include
Index: src/sys/modules/ufs/Makefile
diff -u src/sys/modules/ufs/Makefile:1.9 src/sys/modules/ufs/Makefile:1.10
--- src/sys/modules/ufs/Makefile:1.9 Mon May 20 18:14:38 2024
+++ src/sys/modules/ufs/Makefile Wed May 22 17:20:45 2024
@@ -1,25 +1,19 @@
-# $NetBSD: Makefile,v 1.9 2024/05/20 18:14:38 pgoyette Exp $
+# $NetBSD: Makefile,v 1.10 2024/05/22 17:20:45 pgoyette Exp $
.include "../Makefile.inc"
KMOD= ufs
CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
-CPPFLAGS+= -DUFS_DIRHASH
+CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -DUFS_DIRHASH
CWARNFLAGS.clang= -Wno-conversion
.PATH: ${S}/ufs/ufs
-SRCS+= ufs_bmap.c ufs_dirhash.c ufs_inode.c \
+SRCS+= ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_inode.c \
ufs_lookup.c ufs_quota.c ufs_quota1.c ufs_quota2.c ufs_rename.c \
ufs_vfsops.c ufs_vnops.c quota1_subr.c quota2_subr.c
-#CPPFLAGS+= -DUFS_ACL
-#SRCS+= ufs_acl.c
-
-#CPPFLAGS+= -DUFS_EXTATTR
-#SRCS+= ufs_extattr.c
-
WARNS= 3
.include
CVS commit: src/sys/modules
Module Name:src
Committed By: pgoyette
Date: Mon May 20 18:14:38 UTC 2024
Modified Files:
src/sys/modules: Makefile
src/sys/modules/ffs: Makefile
src/sys/modules/ufs: Makefile
Log Message:
Oooppss remove some local change that was accidentally committed
To generate a diff of this commit:
cvs rdiff -u -r1.289 -r1.290 src/sys/modules/Makefile
cvs rdiff -u -r1.24 -r1.25 src/sys/modules/ffs/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/modules/ufs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.289 src/sys/modules/Makefile:1.290
--- src/sys/modules/Makefile:1.289 Mon May 20 17:32:51 2024
+++ src/sys/modules/Makefile Mon May 20 18:14:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.289 2024/05/20 17:32:51 pgoyette Exp $
+# $NetBSD: Makefile,v 1.290 2024/05/20 18:14:38 pgoyette Exp $
.include
@@ -513,14 +513,6 @@ SUBDIR+= virtio_pci
SUBDIR+= vioscsi
.endif
-# We need these four locally XXX-PRG
-.if ${MACHINE_ARCH} == "x86_64"
-SUBDIR+= ld
-SUBDIR+= ld_nvme
-SUBDIR+= nvme
-SUBDIR+= ksem
-.endif
-
SUBDIR+= examples # build these regularly to avoid bit-rot
.endif
Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.24 src/sys/modules/ffs/Makefile:1.25
--- src/sys/modules/ffs/Makefile:1.24 Sat Jun 3 08:52:58 2023
+++ src/sys/modules/ffs/Makefile Mon May 20 18:14:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/06/03 08:52:58 lukem Exp $
+# $NetBSD: Makefile,v 1.25 2024/05/20 18:14:38 pgoyette Exp $
.include "../Makefile.inc"
@@ -6,15 +6,21 @@
KMOD= ffs
CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
-CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -DUFS_DIRHASH
+CPPFLAGS+= -DUFS_DIRHASH
CWARNFLAGS.clang= -Wno-conversion
COPTS.ffs_appleufs.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
SRCS+= ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_subr.c ffs_tables.c \
- ffs_vfsops.c ffs_vnops.c ffs_snapshot.c ffs_extattr.c \
+ ffs_vfsops.c ffs_vnops.c ffs_snapshot.c \
ffs_bswap.c ffs_wapbl.c ffs_appleufs.c ffs_quota2.c
+#CPPFLAGS+= -DUFS_EXTATTR
+#SRCS+= ffs_extattr.c
+
+#CPPFLAGS+= -DUFS_ACL
+#SRCS+= ufs_acl.c
+
WARNS= 3
.include
Index: src/sys/modules/ufs/Makefile
diff -u src/sys/modules/ufs/Makefile:1.8 src/sys/modules/ufs/Makefile:1.9
--- src/sys/modules/ufs/Makefile:1.8 Tue Aug 9 20:05:14 2022
+++ src/sys/modules/ufs/Makefile Mon May 20 18:14:38 2024
@@ -1,19 +1,25 @@
-# $NetBSD: Makefile,v 1.8 2022/08/09 20:05:14 pgoyette Exp $
+# $NetBSD: Makefile,v 1.9 2024/05/20 18:14:38 pgoyette Exp $
.include "../Makefile.inc"
KMOD= ufs
CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
-CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -DUFS_DIRHASH
+CPPFLAGS+= -DUFS_DIRHASH
CWARNFLAGS.clang= -Wno-conversion
.PATH: ${S}/ufs/ufs
-SRCS+= ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_inode.c \
+SRCS+= ufs_bmap.c ufs_dirhash.c ufs_inode.c \
ufs_lookup.c ufs_quota.c ufs_quota1.c ufs_quota2.c ufs_rename.c \
ufs_vfsops.c ufs_vnops.c quota1_subr.c quota2_subr.c
+#CPPFLAGS+= -DUFS_ACL
+#SRCS+= ufs_acl.c
+
+#CPPFLAGS+= -DUFS_EXTATTR
+#SRCS+= ufs_extattr.c
+
WARNS= 3
.include
CVS commit: src/sys/modules
Module Name:src Committed By: pgoyette Date: Mon May 20 18:14:38 UTC 2024 Modified Files: src/sys/modules: Makefile src/sys/modules/ffs: Makefile src/sys/modules/ufs: Makefile Log Message: Oooppss remove some local change that was accidentally committed To generate a diff of this commit: cvs rdiff -u -r1.289 -r1.290 src/sys/modules/Makefile cvs rdiff -u -r1.24 -r1.25 src/sys/modules/ffs/Makefile cvs rdiff -u -r1.8 -r1.9 src/sys/modules/ufs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src
Committed By: pgoyette
Date: Mon May 20 17:32:51 UTC 2024
Modified Files:
src/sys/modules: Makefile
Log Message:
Don't build the compat_110 module yet - there's no release_110 with which
we can be compatable.
To generate a diff of this commit:
cvs rdiff -u -r1.288 -r1.289 src/sys/modules/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.288 src/sys/modules/Makefile:1.289
--- src/sys/modules/Makefile:1.288 Mon May 20 13:34:12 2024
+++ src/sys/modules/Makefile Mon May 20 17:32:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.288 2024/05/20 13:34:12 riastradh Exp $
+# $NetBSD: Makefile,v 1.289 2024/05/20 17:32:51 pgoyette Exp $
.include
@@ -322,7 +322,6 @@ SUBDIR+= compat_netbsd32_20 compat_netbs
SUBDIR+= compat_netbsd32_40 compat_netbsd32_50
SUBDIR+= compat_netbsd32_60 compat_netbsd32_80
SUBDIR+= compat_netbsd32_90 compat_netbsd32_100
-SUBDIR+= compat_netbsd32_110
SUBDIR+= compat_netbsd32_43
SUBDIR+= compat_netbsd32_coredump
SUBDIR+= compat_netbsd32_mqueue
@@ -514,6 +513,14 @@ SUBDIR+= virtio_pci
SUBDIR+= vioscsi
.endif
+# We need these four locally XXX-PRG
+.if ${MACHINE_ARCH} == "x86_64"
+SUBDIR+= ld
+SUBDIR+= ld_nvme
+SUBDIR+= nvme
+SUBDIR+= ksem
+.endif
+
SUBDIR+= examples # build these regularly to avoid bit-rot
.endif
CVS commit: src/sys/modules
Module Name:src Committed By: pgoyette Date: Mon May 20 17:32:51 UTC 2024 Modified Files: src/sys/modules: Makefile Log Message: Don't build the compat_110 module yet - there's no release_110 with which we can be compatable. To generate a diff of this commit: cvs rdiff -u -r1.288 -r1.289 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src Committed By: riastradh Date: Mon May 20 13:34:13 UTC 2024 Modified Files: src/sys/modules: Makefile Log Message: sys/modules: Don't make compat_110. Eventually we'll need this but it doesn't make sense until 11.0 is released. To generate a diff of this commit: cvs rdiff -u -r1.287 -r1.288 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.287 src/sys/modules/Makefile:1.288 --- src/sys/modules/Makefile:1.287 Sun May 19 22:25:49 2024 +++ src/sys/modules/Makefile Mon May 20 13:34:12 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.287 2024/05/19 22:25:49 christos Exp $ +# $NetBSD: Makefile,v 1.288 2024/05/20 13:34:12 riastradh Exp $ .include @@ -12,7 +12,10 @@ SUBDIR+= compat_43 compat_sysctl_09_43 SUBDIR+= compat_09 compat_10 compat_12 compat_13 compat_14 SUBDIR+= compat_16 compat_20 compat_30 compat_40 compat_50 SUBDIR+= compat_60 compat_70 compat_80 compat_90 compat_100 -SUBDIR+= compat_110 + +# Not until 11.0 is released and we need binary compatibility with it +# in >11.0. +#SUBDIR+= compat_110 SUBDIR+= compat_sysv_10 compat_sysv_14 compat_sysv_50
CVS commit: src/sys/modules
Module Name:src Committed By: riastradh Date: Mon May 20 13:34:13 UTC 2024 Modified Files: src/sys/modules: Makefile Log Message: sys/modules: Don't make compat_110. Eventually we'll need this but it doesn't make sense until 11.0 is released. To generate a diff of this commit: cvs rdiff -u -r1.287 -r1.288 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/examples/fopsmapper
Module Name:src
Committed By: riastradh
Date: Wed Apr 17 18:10:27 UTC 2024
Modified Files:
src/sys/modules/examples/fopsmapper: cmd_mapper.c fopsmapper.c
Log Message:
modules/examples/fopsmapper: KNF, sprinkle comments
Missing: MP-safety; this is a kind of broken example.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/examples/fopsmapper/cmd_mapper.c \
src/sys/modules/examples/fopsmapper/fopsmapper.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/modules/examples/fopsmapper/cmd_mapper.c
diff -u src/sys/modules/examples/fopsmapper/cmd_mapper.c:1.2 src/sys/modules/examples/fopsmapper/cmd_mapper.c:1.3
--- src/sys/modules/examples/fopsmapper/cmd_mapper.c:1.2 Wed Apr 1 13:07:32 2020
+++ src/sys/modules/examples/fopsmapper/cmd_mapper.c Wed Apr 17 18:10:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cmd_mapper.c,v 1.2 2020/04/01 13:07:32 kamil Exp $ */
+/* $NetBSD: cmd_mapper.c,v 1.3 2024/04/17 18:10:27 riastradh Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: cmd_mapper.c,v 1.2 2020/04/01 13:07:32 kamil Exp $");
+__RCSID("$NetBSD: cmd_mapper.c,v 1.3 2024/04/17 18:10:27 riastradh Exp $");
#include
@@ -37,7 +37,7 @@ __RCSID("$NetBSD: cmd_mapper.c,v 1.2 202
#include
#include
-#define _PATH_DEV_MAPPER "/dev/fopsmapper"
+#define _PATH_DEV_MAPPER "/dev/fopsmapper"
int main(int argc, char **argv)
{
@@ -47,12 +47,11 @@ int main(int argc, char **argv)
if ((devfd = open(_PATH_DEV_MAPPER, O_RDONLY)) == -1)
err(EXIT_FAILURE, "Cannot open %s", _PATH_DEV_MAPPER);
- map = (char *)(mmap(0, sysconf(_SC_PAGESIZE), PROT_READ, MAP_SHARED,
-devfd, 0));
+ map = mmap(0, sysconf(_SC_PAGESIZE), PROT_READ, MAP_SHARED, devfd, 0);
if (map == MAP_FAILED)
err(EXIT_FAILURE, "Mapping failed");
- printf("Message from device: %s\n",map);
+ printf("Message from device: %s\n", map);
if (munmap(map, sysconf(_SC_PAGESIZE)) == -1)
err(EXIT_FAILURE, "Unmap failed");
Index: src/sys/modules/examples/fopsmapper/fopsmapper.c
diff -u src/sys/modules/examples/fopsmapper/fopsmapper.c:1.2 src/sys/modules/examples/fopsmapper/fopsmapper.c:1.3
--- src/sys/modules/examples/fopsmapper/fopsmapper.c:1.2 Wed Apr 1 11:45:53 2020
+++ src/sys/modules/examples/fopsmapper/fopsmapper.c Wed Apr 17 18:10:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fopsmapper.c,v 1.2 2020/04/01 11:45:53 kamil Exp $ */
+/* $NetBSD: fopsmapper.c,v 1.3 2024/04/17 18:10:27 riastradh Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -27,29 +27,30 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fopsmapper.c,v 1.2 2020/04/01 11:45:53 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fopsmapper.c,v 1.3 2024/04/17 18:10:27 riastradh Exp $");
-#include
-#include
-#include
-#include
+#include
#include
#include
#include
+#include
#include
#include
+#include
#include
+#include
+#include
+
#include
/*
* To use this module you need to:
*
* mknod /dev/fopsmapper c 351 0
- *
*/
-dev_type_open(fopsmapper_open);
+dev_open_t fopsmapper_open;
const struct cdevsw fopsmapper_cdevsw = {
.d_open = fopsmapper_open,
@@ -66,9 +67,9 @@ const struct cdevsw fopsmapper_cdevsw =
.d_flag = D_OTHER
};
-static int fopsmapper_mmap(file_t *, off_t *, size_t,
- int, int *, int *,struct uvm_object **, int *);
-static int fopsmapper_close(file_t *);
+static int fopsmapper_mmap(struct file *, off_t *, size_t, int, int *, int *,
+struct uvm_object **, int *);
+static int fopsmapper_close(struct file *);
const struct fileops mapper_fileops = {
.fo_read = fbadop_read,
@@ -83,16 +84,16 @@ const struct fileops mapper_fileops = {
.fo_mmap = fopsmapper_mmap,
};
-typedef struct fopsmapper_softc {
+struct fopsmapper_softc {
char *buf;
struct uvm_object *uobj;
size_t bufsize;
-} fops_t;
+};
int
fopsmapper_open(dev_t dev, int flag, int mode, struct lwp *l)
{
- fops_t *fo;
+ struct fopsmapper_softc *fo;
struct file *fp;
int fd, error;
@@ -105,11 +106,11 @@ fopsmapper_open(dev_t dev, int flag, int
}
int
-fopsmapper_mmap(file_t * fp, off_t * offp, size_t size, int prot,
- int *flagsp, int *advicep, struct uvm_object **uobjp,
- int *maxprotp)
+fopsmapper_mmap(struct file *fp, off_t *offp, size_t size, int prot,
+int *flagsp, int *advicep, struct uvm_object **uobjp, int *maxprotp)
{
- fops_t *fo;
+ struct fopsmapper_softc *fo;
+ vaddr_t va;
int error;
if (prot & PROT_EXEC)
@@ -125,32 +126,35 @@ fopsmapper_mmap(file_t * fp, off_t * off
fo->uobj = uao_create(size, 0);
fo->buf = NULL;
- /* Map the uvm object into kernel */
- error = uvm_map(kernel_map, (vaddr_t *) >buf, fo->bufsize,
- fo->uobj, 0, 0,
- UVM_MAPFLAG(UVM_PROT_RW, UVM_PROT_RW,
- UVM_INH_SHARE,UVM_ADV_RANDOM, 0));
+ /*
+ * Map the uvm object into
CVS commit: src/sys/modules/examples/fopsmapper
Module Name:src Committed By: riastradh Date: Wed Apr 17 18:10:27 UTC 2024 Modified Files: src/sys/modules/examples/fopsmapper: cmd_mapper.c fopsmapper.c Log Message: modules/examples/fopsmapper: KNF, sprinkle comments Missing: MP-safety; this is a kind of broken example. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/examples/fopsmapper/cmd_mapper.c \ src/sys/modules/examples/fopsmapper/fopsmapper.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src Committed By: mrg Date: Sat Mar 9 06:53:48 UTC 2024 Modified Files: src/sys/modules: Makefile Log Message: skip this subdir for "make includes". it's excessively slow and does nothing (nor should it.) To generate a diff of this commit: cvs rdiff -u -r1.281 -r1.282 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src Committed By: mrg Date: Sat Mar 9 06:53:48 UTC 2024 Modified Files: src/sys/modules: Makefile Log Message: skip this subdir for "make includes". it's excessively slow and does nothing (nor should it.) To generate a diff of this commit: cvs rdiff -u -r1.281 -r1.282 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.281 src/sys/modules/Makefile:1.282 --- src/sys/modules/Makefile:1.281 Tue Dec 26 16:20:01 2023 +++ src/sys/modules/Makefile Sat Mar 9 06:53:48 2024 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.281 2023/12/26 16:20:01 pgoyette Exp $ +# $NetBSD: Makefile,v 1.282 2024/03/09 06:53:48 mrg Exp $ .include +.if !make(includes) # For all platforms # Modules for compatibility with earlier versions of NetBSD @@ -509,4 +510,6 @@ SUBDIR+= vioscsi SUBDIR+= examples # build these regularly to avoid bit-rot +.endif + .include
CVS commit: src/sys/modules/compat_90
Module Name:src Committed By: pgoyette Date: Sun Dec 10 00:29:25 UTC 2023 Modified Files: src/sys/modules/compat_90: Makefile Log Message: Default the build of compat_90 module to include IPv6, as is done for other INET6-sensitive modules (see if_lagg). XXX Pullup to -10 (will add to existing ticket) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/compat_90/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/compat_90/Makefile diff -u src/sys/modules/compat_90/Makefile:1.2 src/sys/modules/compat_90/Makefile:1.3 --- src/sys/modules/compat_90/Makefile:1.2 Sat Dec 9 15:21:01 2023 +++ src/sys/modules/compat_90/Makefile Sun Dec 10 00:29:24 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2023/12/09 15:21:01 pgoyette Exp $ +# $NetBSD: Makefile,v 1.3 2023/12/10 00:29:24 pgoyette Exp $ .include "../Makefile.inc" @@ -7,6 +7,12 @@ KMOD= compat_90 CPPFLAGS+= -DCOMPAT_90 +CPPFLAGS+= -DINET + +# Remove/comment the following if the target kernel on which the +# module may be loaded doesn't have IPv6. Enable this by default. + +CPPFLAGS+= -DINET6 SRCS+= compat_90_mod.c SRCS+= net_inet6_nd_90.c
CVS commit: src/sys/modules/compat_90
Module Name:src Committed By: pgoyette Date: Sun Dec 10 00:29:25 UTC 2023 Modified Files: src/sys/modules/compat_90: Makefile Log Message: Default the build of compat_90 module to include IPv6, as is done for other INET6-sensitive modules (see if_lagg). XXX Pullup to -10 (will add to existing ticket) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/compat_90/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/amdgpu
Module Name:src Committed By: mrg Date: Sun Sep 10 15:12:39 UTC 2023 Modified Files: src/sys/modules/amdgpu: Makefile Log Message: use CC_WNO_MAYBE_UNINITIALIZED and fix the clang build. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/modules/amdgpu/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/amdgpu
Module Name:src
Committed By: mrg
Date: Sun Sep 10 15:12:39 UTC 2023
Modified Files:
src/sys/modules/amdgpu: Makefile
Log Message:
use CC_WNO_MAYBE_UNINITIALIZED and fix the clang build.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/amdgpu/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/amdgpu/Makefile
diff -u src/sys/modules/amdgpu/Makefile:1.7 src/sys/modules/amdgpu/Makefile:1.8
--- src/sys/modules/amdgpu/Makefile:1.7 Mon Sep 4 21:45:35 2023
+++ src/sys/modules/amdgpu/Makefile Sun Sep 10 15:12:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/09/04 21:45:35 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2023/09/10 15:12:39 mrg Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -55,7 +55,7 @@ CWARNFLAGS.amdgpu_hw_hpd.c+= -Wno-type-l
CWARNFLAGS.amdgpu_navi10_ppt.c+= -Wno-type-limits
CWARNFLAGS.amdgpu_polaris10_smumgr.c+= -Wno-cast-qual
CWARNFLAGS.amdgpu_process_pptables_v1_0.c+= -Wno-cast-qual
-CWARNFLAGS.amdgpu_rlc.c+= -Wno-maybe-uninitialized
+CWARNFLAGS.amdgpu_rlc.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
CWARNFLAGS.amdgpu_rn_clk_mgr.c+= -Wno-type-limits
CWARNFLAGS.amdgpu_vega10_reg_init.c+= -Wno-cast-qual
CWARNFLAGS.amdgpu_vega20_reg_init.c+= -Wno-cast-qual
CVS commit: src/sys/modules/drmkms
Module Name:src Committed By: riastradh Date: Tue Sep 5 21:57:29 UTC 2023 Added Files: src/sys/modules/drmkms: drmkms_pci.h Log Message: drmkms: Fix module build. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/modules/drmkms/drmkms_pci.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/drmkms
Module Name:src Committed By: riastradh Date: Tue Sep 5 21:57:29 UTC 2023 Added Files: src/sys/modules/drmkms: drmkms_pci.h Log Message: drmkms: Fix module build. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/modules/drmkms/drmkms_pci.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/modules/drmkms/drmkms_pci.h diff -u /dev/null src/sys/modules/drmkms/drmkms_pci.h:1.1 --- /dev/null Tue Sep 5 21:57:29 2023 +++ src/sys/modules/drmkms/drmkms_pci.h Tue Sep 5 21:57:28 2023 @@ -0,0 +1 @@ +/* no PCI in generic drmkms module */
CVS commit: src/sys/modules/compat_100
Module Name:src Committed By: christos Date: Tue Sep 5 14:49:46 UTC 2023 Modified Files: src/sys/modules/compat_100: Makefile Log Message: Add missing file To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/compat_100/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/compat_100/Makefile diff -u src/sys/modules/compat_100/Makefile:1.1 src/sys/modules/compat_100/Makefile:1.2 --- src/sys/modules/compat_100/Makefile:1.1 Mon Dec 19 18:19:51 2022 +++ src/sys/modules/compat_100/Makefile Tue Sep 5 10:49:46 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/12/19 23:19:51 pgoyette Exp $ +# $NetBSD: Makefile,v 1.2 2023/09/05 14:49:46 christos Exp $ .include "../Makefile.inc" @@ -8,6 +8,6 @@ KMOD= compat_100 CPPFLAGS+= -DCOMPAT_100 -SRCS+= compat_100_mod.c +SRCS+= compat_100_mod.c kern_event_100.c .include
CVS commit: src/sys/modules/compat_100
Module Name:src Committed By: christos Date: Tue Sep 5 14:49:46 UTC 2023 Modified Files: src/sys/modules/compat_100: Makefile Log Message: Add missing file To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/compat_100/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src Committed By: mrg Date: Mon Sep 4 21:45:35 UTC 2023 Modified Files: src/sys/modules/amdgpu: Makefile src/sys/modules/i915drmkms: Makefile Log Message: apply some warning disables for GCC 12. *possibly* the one for intel_dp.c is a real bug but it seems very difficult to be sure (i can't seem to convince myself either way.) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/modules/amdgpu/Makefile cvs rdiff -u -r1.22 -r1.23 src/sys/modules/i915drmkms/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src
Committed By: mrg
Date: Mon Sep 4 21:45:35 UTC 2023
Modified Files:
src/sys/modules/amdgpu: Makefile
src/sys/modules/i915drmkms: Makefile
Log Message:
apply some warning disables for GCC 12.
*possibly* the one for intel_dp.c is a real bug but it seems very
difficult to be sure (i can't seem to convince myself either way.)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/amdgpu/Makefile
cvs rdiff -u -r1.22 -r1.23 src/sys/modules/i915drmkms/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/amdgpu/Makefile
diff -u src/sys/modules/amdgpu/Makefile:1.6 src/sys/modules/amdgpu/Makefile:1.7
--- src/sys/modules/amdgpu/Makefile:1.6 Fri Jul 14 13:05:59 2023
+++ src/sys/modules/amdgpu/Makefile Mon Sep 4 21:45:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/07/14 13:05:59 riastradh Exp $
+# $NetBSD: Makefile,v 1.7 2023/09/04 21:45:35 mrg Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -55,6 +55,7 @@ CWARNFLAGS.amdgpu_hw_hpd.c+= -Wno-type-l
CWARNFLAGS.amdgpu_navi10_ppt.c+= -Wno-type-limits
CWARNFLAGS.amdgpu_polaris10_smumgr.c+= -Wno-cast-qual
CWARNFLAGS.amdgpu_process_pptables_v1_0.c+= -Wno-cast-qual
+CWARNFLAGS.amdgpu_rlc.c+= -Wno-maybe-uninitialized
CWARNFLAGS.amdgpu_rn_clk_mgr.c+= -Wno-type-limits
CWARNFLAGS.amdgpu_vega10_reg_init.c+= -Wno-cast-qual
CWARNFLAGS.amdgpu_vega20_reg_init.c+= -Wno-cast-qual
Index: src/sys/modules/i915drmkms/Makefile
diff -u src/sys/modules/i915drmkms/Makefile:1.22 src/sys/modules/i915drmkms/Makefile:1.23
--- src/sys/modules/i915drmkms/Makefile:1.22 Sat Jun 3 21:31:47 2023
+++ src/sys/modules/i915drmkms/Makefile Mon Sep 4 21:45:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2023/06/03 21:31:47 lukem Exp $
+# $NetBSD: Makefile,v 1.23 2023/09/04 21:45:35 mrg Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -56,16 +56,20 @@ CWARNFLAGS+= -Wno-missing-field-initiali
CWARNFLAGS+= -Wno-pointer-arith
CWARNFLAGS+= -Wno-shadow
+COPTS.i915_irq.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
COPTS.i915_pci.c+= ${${ACTIVE_CC} == "gcc":? -Wno-override-init :}
COPTS.i915_pci.c+= ${${ACTIVE_CC} == "clang":? -Wno-initializer-overrides :}
COPTS.i915_sw_fence.c+= ${${ACTIVE_CC} == "clang":? -Wno-unused-function :}
-COPTS.intel_sprite.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
-COPTS.intel_ddi.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
COPTS.intel_ddi.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.intel_ddi.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
COPTS.intel_display.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.intel_display_power.c+= ${${ACTIVE_CC} == "gcc":? -Wno-array-bounds :}
+COPTS.intel_dp.c+= ${CC_WNO_STRINGOP_OVERREAD}
COPTS.intel_guc_submission.c+= ${${ACTIVE_CC} == "clang":? -Wno-unused-function :}
COPTS.intel_hdmi.c+= ${${ACTIVE_CC} == "clang":? -Wno-unused-function :}
+COPTS.intel_pm.c+= ${CC_WNO_STRINGOP_OVERREAD} ${CC_WNO_STRINGOP_OVERFLOW}
COPTS.intel_sdvo.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.intel_sprite.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
# NetBSD additions.
SRCS+= i915_module.c
CVS commit: src/sys/modules/compat_netbsd32
Module Name:src
Committed By: christos
Date: Wed Aug 30 12:18:59 UTC 2023
Modified Files:
src/sys/modules/compat_netbsd32: Makefile
Log Message:
Add missing netbsd32_epoll.c
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/modules/compat_netbsd32/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/compat_netbsd32/Makefile
diff -u src/sys/modules/compat_netbsd32/Makefile:1.37 src/sys/modules/compat_netbsd32/Makefile:1.38
--- src/sys/modules/compat_netbsd32/Makefile:1.37 Sat Nov 7 16:42:32 2020
+++ src/sys/modules/compat_netbsd32/Makefile Wed Aug 30 08:18:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2020/11/07 21:42:32 christos Exp $
+# $NetBSD: Makefile,v 1.38 2023/08/30 12:18:59 christos Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@@ -30,6 +30,7 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/sys/externa
SRCS+= netbsd32_drm.c
.endif
SRCS+= netbsd32_acl.c netbsd32_event.c
+SRCS+= netbsd32_epoll.c
SRCS+= netbsd32_exec_elf32.c netbsd32_execve.c
SRCS+= netbsd32_fd.c netbsd32_fs.c
SRCS+= netbsd32_futex.c
CVS commit: src/sys/modules/compat_netbsd32
Module Name:src Committed By: christos Date: Wed Aug 30 12:18:59 UTC 2023 Modified Files: src/sys/modules/compat_netbsd32: Makefile Log Message: Add missing netbsd32_epoll.c To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/modules/compat_netbsd32/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/compat_linux
Module Name:src
Committed By: christos
Date: Mon Aug 21 19:43:22 UTC 2023
Modified Files:
src/sys/modules/compat_linux: Makefile
Log Message:
Add inotify (thanks Ryo)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/compat_linux/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/compat_linux/Makefile
diff -u src/sys/modules/compat_linux/Makefile:1.6 src/sys/modules/compat_linux/Makefile:1.7
--- src/sys/modules/compat_linux/Makefile:1.6 Sat Oct 9 03:01:35 2021
+++ src/sys/modules/compat_linux/Makefile Mon Aug 21 15:43:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/10/09 07:01:35 ryo Exp $
+# $NetBSD: Makefile,v 1.7 2023/08/21 19:43:22 christos Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@@ -13,6 +13,7 @@ SRCS+= linux_fdio.c linux_file.c linux_h
SRCS+= linux_ipc.c linux_misc.c linux_mtio.c linux_sched.c
SRCS+= linux_sg.c linux_signal.c linux_signo.c linux_socket.c
SRCS+= linux_sysctl.c linux_termios.c linux_time.c linux_mod.c
+SRCS+= linux_inotify.c
.if ${MACHINE_CPU} == "aarch64"
CPPFLAGS+= -DEXEC_ELF64
CVS commit: src/sys/modules/compat_linux
Module Name:src Committed By: christos Date: Mon Aug 21 19:43:22 UTC 2023 Modified Files: src/sys/modules/compat_linux: Makefile Log Message: Add inotify (thanks Ryo) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/modules/compat_linux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src
Committed By: riastradh
Date: Thu Apr 13 07:03:32 UTC 2023
Modified Files:
src/sys/modules: Makefile
Log Message:
sys/modules/Makefile: Use MACHINE_CPU, not MACHINE_ARCH, for aarch64.
This way it covers both little-endian and big-endian.
To generate a diff of this commit:
cvs rdiff -u -r1.276 -r1.277 src/sys/modules/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.276 src/sys/modules/Makefile:1.277
--- src/sys/modules/Makefile:1.276 Tue Apr 11 10:30:41 2023
+++ src/sys/modules/Makefile Thu Apr 13 07:03:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.276 2023/04/11 10:30:41 riastradh Exp $
+# $NetBSD: Makefile,v 1.277 2023/04/13 07:03:31 riastradh Exp $
.include
@@ -351,7 +351,7 @@ SUBDIR+= viadrmums
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64" || \
-${MACHINE_ARCH} == "aarch64"
+${MACHINE_CPU} == "aarch64"
SUBDIR+= amdgpu
SUBDIR+= drmkms
SUBDIR+= drmkms_linux
CVS commit: src/sys/modules
Module Name:src Committed By: riastradh Date: Thu Apr 13 07:03:32 UTC 2023 Modified Files: src/sys/modules: Makefile Log Message: sys/modules/Makefile: Use MACHINE_CPU, not MACHINE_ARCH, for aarch64. This way it covers both little-endian and big-endian. To generate a diff of this commit: cvs rdiff -u -r1.276 -r1.277 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/hdafg
Module Name:src
Committed By: mrg
Date: Sat Feb 18 05:25:59 UTC 2023
Modified Files:
src/sys/modules/hdafg: Makefile
Log Message:
the HDAUDIO_ENABLE_HDMI option is obsolete. don't define here..
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/hdafg/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/hdafg/Makefile
diff -u src/sys/modules/hdafg/Makefile:1.7 src/sys/modules/hdafg/Makefile:1.8
--- src/sys/modules/hdafg/Makefile:1.7 Sun Feb 17 04:05:49 2019
+++ src/sys/modules/hdafg/Makefile Sat Feb 18 05:25:59 2023
@@ -1,14 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2019/02/17 04:05:49 rin Exp $
+# $NetBSD: Makefile,v 1.8 2023/02/18 05:25:59 mrg Exp $
.include "../Makefile.inc"
.include "${.CURDIR}/Makefile.inc"
KMOD= hdafg
-# For non-rump modules, enable HDMI audio
-
-CPPFLAGS+= -DHDAUDIO_ENABLE_HDMI
-
WARNS= 3
.include
CVS commit: src/sys/modules/hdafg
Module Name:src Committed By: mrg Date: Sat Feb 18 05:25:59 UTC 2023 Modified Files: src/sys/modules/hdafg: Makefile Log Message: the HDAUDIO_ENABLE_HDMI option is obsolete. don't define here.. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/modules/hdafg/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/examples/ddbping
Module Name:src
Committed By: uwe
Date: Wed Feb 1 10:22:20 UTC 2023
Modified Files:
src/sys/modules/examples/ddbping: ddbping.c
Log Message:
ddbping - restore the original narration of the example, NFCI
Adjust previous change so that it only replaces my home-grown define
for the end marker with the new official DDB_END_CMD marker that it
introduced. Undo the rest of that last change.
As the author of this example I'm pretty sure what example I wanted to
set and this narration order is an important part of it.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/examples/ddbping/ddbping.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/modules/examples/ddbping/ddbping.c
diff -u src/sys/modules/examples/ddbping/ddbping.c:1.2 src/sys/modules/examples/ddbping/ddbping.c:1.3
--- src/sys/modules/examples/ddbping/ddbping.c:1.2 Tue Feb 23 07:13:53 2021
+++ src/sys/modules/examples/ddbping/ddbping.c Wed Feb 1 10:22:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ddbping.c,v 1.2 2021/02/23 07:13:53 mrg Exp $ */
+/* $NetBSD: ddbping.c,v 1.3 2023/02/01 10:22:20 uwe Exp $ */
/*
* Copyright (c) 2020 Valery Ushakov
* All rights reserved.
@@ -28,19 +28,42 @@
* Example of a kernel module that registers DDB commands.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ddbping.c,v 1.2 2021/02/23 07:13:53 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddbping.c,v 1.3 2023/02/01 10:22:20 uwe Exp $");
#include
#include
#include
+/* XXX: db_command.h should provide something like this */
+typedef void db_cmdfn_t(db_expr_t, bool, db_expr_t, const char *);
+
+
+static db_cmdfn_t db_ping;
+static db_cmdfn_t db_show_ping;
+
+
+static const struct db_command db_ping_base_tbl[] = {
+ { DDB_ADD_CMD("ping", db_ping, 0,
+ "Example command",
+ NULL, NULL) },
+ { DDB_END_CMD },
+};
+
+static const struct db_command db_ping_show_tbl[] = {
+ { DDB_ADD_CMD("ping", db_show_ping, 0,
+ "Example command stats",
+ NULL, NULL) },
+ { DDB_END_CMD },
+};
+
static unsigned int ping_count;
static unsigned int ping_count_modif;
static unsigned int ping_count_addr;
static unsigned int ping_count_count;
+
static void
db_ping(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
{
@@ -75,20 +98,6 @@ db_show_ping(db_expr_t addr, bool have_a
db_printf("with count\t%u\n", ping_count_count);
}
-static const struct db_command db_ping_base_tbl[] = {
- { DDB_ADD_CMD("ping", db_ping, 0,
- "Example command",
- NULL, NULL) },
- { DDB_END_CMD },
-};
-
-static const struct db_command db_ping_show_tbl[] = {
- { DDB_ADD_CMD("ping", db_show_ping, 0,
- "Example command stats",
- NULL, NULL) },
- { DDB_END_CMD },
-};
-
MODULE(MODULE_CLASS_MISC, ddbping, NULL);
CVS commit: src/sys/modules/examples/ddbping
Module Name:src Committed By: uwe Date: Wed Feb 1 10:22:20 UTC 2023 Modified Files: src/sys/modules/examples/ddbping: ddbping.c Log Message: ddbping - restore the original narration of the example, NFCI Adjust previous change so that it only replaces my home-grown define for the end marker with the new official DDB_END_CMD marker that it introduced. Undo the rest of that last change. As the author of this example I'm pretty sure what example I wanted to set and this narration order is an important part of it. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/examples/ddbping/ddbping.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/drmkms_pci
Module Name:src Committed By: riastradh Date: Tue Jan 31 13:09:54 UTC 2023 Modified Files: src/sys/modules/drmkms_pci: Makefile Log Message: sys/modules/drmkms_pci: Remove drm_agpsupport.c. This was moved to a separate drmkms_agp module. XXX pullup-10 XXX pullup-9, maybe (not sure any of modularized drmkms works in 9, though) To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/modules/drmkms_pci/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/drmkms_pci/Makefile diff -u src/sys/modules/drmkms_pci/Makefile:1.10 src/sys/modules/drmkms_pci/Makefile:1.11 --- src/sys/modules/drmkms_pci/Makefile:1.10 Sun Dec 19 11:54:25 2021 +++ src/sys/modules/drmkms_pci/Makefile Tue Jan 31 13:09:54 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2021/12/19 11:54:25 riastradh Exp $ +# $NetBSD: Makefile,v 1.11 2023/01/31 13:09:54 riastradh Exp $ .include "../Makefile.inc" .include "../drmkms/Makefile.inc" @@ -13,7 +13,6 @@ KMOD= drmkms_pci SRCS+= drmfb_pci.c SRCS+= linux_pci.c -SRCS+= drm_agpsupport.c SRCS+= drm_pci.c SRCS+= drm_pci_module.c
CVS commit: src/sys/modules/drmkms_pci
Module Name:src Committed By: riastradh Date: Tue Jan 31 13:09:54 UTC 2023 Modified Files: src/sys/modules/drmkms_pci: Makefile Log Message: sys/modules/drmkms_pci: Remove drm_agpsupport.c. This was moved to a separate drmkms_agp module. XXX pullup-10 XXX pullup-9, maybe (not sure any of modularized drmkms works in 9, though) To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/modules/drmkms_pci/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/drmkms
Module Name:src Committed By: riastradh Date: Tue Jan 31 13:09:05 UTC 2023 Modified Files: src/sys/modules/drmkms: Makefile Log Message: sys/modules/drmkms: Remove GPU scheduler files. These have been moved out to drmkms_sched.kmod. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/modules/drmkms/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/drmkms/Makefile diff -u src/sys/modules/drmkms/Makefile:1.18 src/sys/modules/drmkms/Makefile:1.19 --- src/sys/modules/drmkms/Makefile:1.18 Sun Jul 17 15:35:42 2022 +++ src/sys/modules/drmkms/Makefile Tue Jan 31 13:09:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2022/07/17 15:35:42 riastradh Exp $ +# $NetBSD: Makefile,v 1.19 2023/01/31 13:09:04 riastradh Exp $ .include "../Makefile.inc" .include "Makefile.inc" @@ -52,10 +52,7 @@ SRCS+= drm_legacy_misc.c SRCS+= drm_lock.c SRCS+= drm_scatter.c -# GPU scheduler -SRCS+= sched_entity.c -SRCS+= sched_fence.c -SRCS+= sched_main.c +# GPU scheduler is separatd out into drmkms_sched.kmod # Upstream source files. #SRCS+= drm_agpsupport.c
CVS commit: src/sys/modules/drmkms
Module Name:src Committed By: riastradh Date: Tue Jan 31 13:09:05 UTC 2023 Modified Files: src/sys/modules/drmkms: Makefile Log Message: sys/modules/drmkms: Remove GPU scheduler files. These have been moved out to drmkms_sched.kmod. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/modules/drmkms/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src Committed By: martin Date: Wed Sep 7 11:26:23 UTC 2022 Modified Files: src/sys/modules: Makefile Log Message: Move emuxki from i386/amd64 specific modules to attachment specific modules (effectively disabling it for the build for now, as it needs setlist fixes and breaks the build). To generate a diff of this commit: cvs rdiff -u -r1.270 -r1.271 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.270 src/sys/modules/Makefile:1.271 --- src/sys/modules/Makefile:1.270 Wed Sep 7 00:29:23 2022 +++ src/sys/modules/Makefile Wed Sep 7 11:26:23 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.270 2022/09/07 00:29:23 khorben Exp $ +# $NetBSD: Makefile,v 1.271 2022/09/07 11:26:23 martin Exp $ .include @@ -225,7 +225,6 @@ SUBDIR+= amdsmn SUBDIR+= amdtemp SUBDIR+= amdzentemp SUBDIR+= coretemp -SUBDIR+= emuxki SUBDIR+= est SUBDIR+= hdafg SUBDIR+= hdaudio @@ -469,6 +468,7 @@ SUBDIR+= ataraid SUBDIR+= cac SUBDIR+= cac_eisa SUBDIR+= cac_pci +SUBDIR+= emuxki SUBDIR+= if_aq SUBDIR+= if_vioif SUBDIR+= if_vmx
CVS commit: src/sys/modules
Module Name:src Committed By: martin Date: Wed Sep 7 11:26:23 UTC 2022 Modified Files: src/sys/modules: Makefile Log Message: Move emuxki from i386/amd64 specific modules to attachment specific modules (effectively disabling it for the build for now, as it needs setlist fixes and breaks the build). To generate a diff of this commit: cvs rdiff -u -r1.270 -r1.271 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src Committed By: pgoyette Date: Tue Aug 9 20:05:14 UTC 2022 Modified Files: src/sys/modules/ffs: Makefile src/sys/modules/ufs: Makefile Log Message: Now that UFS_DIRHASH is default for biuilt-in file system modules, we need to update the loadable module builds, too. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/modules/ffs/Makefile cvs rdiff -u -r1.7 -r1.8 src/sys/modules/ufs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src
Committed By: pgoyette
Date: Tue Aug 9 20:05:14 UTC 2022
Modified Files:
src/sys/modules/ffs: Makefile
src/sys/modules/ufs: Makefile
Log Message:
Now that UFS_DIRHASH is default for biuilt-in file system modules, we
need to update the loadable module builds, too.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/modules/ffs/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/ufs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.21 src/sys/modules/ffs/Makefile:1.22
--- src/sys/modules/ffs/Makefile:1.21 Sat Jan 8 01:58:16 2022
+++ src/sys/modules/ffs/Makefile Tue Aug 9 20:05:14 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2022/01/08 01:58:16 pgoyette Exp $
+# $NetBSD: Makefile,v 1.22 2022/08/09 20:05:14 pgoyette Exp $
.include "../Makefile.inc"
@@ -6,8 +6,7 @@
KMOD= ffs
CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
-CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL
-#CPPFLAGS+= -DUFS_DIRHASH # disabled - suspected of corrupting memory
+CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -DUFS_DIRHASH
CWARNFLAGS.clang= -Wno-conversion
COPTS.ffs_appleufs.c+= ${NO_ADDR_OF_PACKED_MEMBER}
Index: src/sys/modules/ufs/Makefile
diff -u src/sys/modules/ufs/Makefile:1.7 src/sys/modules/ufs/Makefile:1.8
--- src/sys/modules/ufs/Makefile:1.7 Sat Jan 8 02:00:49 2022
+++ src/sys/modules/ufs/Makefile Tue Aug 9 20:05:14 2022
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2022/01/08 02:00:49 pgoyette Exp $
+# $NetBSD: Makefile,v 1.8 2022/08/09 20:05:14 pgoyette Exp $
.include "../Makefile.inc"
KMOD= ufs
CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
-CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL
-#CPPFLAGS+= -DUFS_DIRHASH # disabled - suspected of corrupting memory
+CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -DUFS_DIRHASH
CWARNFLAGS.clang= -Wno-conversion
CVS commit: src/sys/modules/amdgpu
Module Name:src
Committed By: tnn
Date: Sat Jul 30 03:29:52 UTC 2022
Modified Files:
src/sys/modules/amdgpu: Makefile
Log Message:
COPTS -> CWARNFLAGS
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/amdgpu/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/amdgpu/Makefile
diff -u src/sys/modules/amdgpu/Makefile:1.4 src/sys/modules/amdgpu/Makefile:1.5
--- src/sys/modules/amdgpu/Makefile:1.4 Sat Jul 30 03:26:45 2022
+++ src/sys/modules/amdgpu/Makefile Sat Jul 30 03:29:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/07/30 03:26:45 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2022/07/30 03:29:52 tnn Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -57,8 +57,8 @@ CWARNFLAGS.amdgpu_process_pptables_v1_0.
CWARNFLAGS.amdgpu_rn_clk_mgr.c+= -Wno-type-limits
CWARNFLAGS.amdgpu_vega10_reg_init.c+= -Wno-cast-qual
CWARNFLAGS.amdgpu_vega20_reg_init.c+= -Wno-cast-qual
-COPTS.amdgpu_uvd.c+= -Wno-format
-COPTS.amdgpu_vcn.c+= -Wno-format
+CWARNFLAGS.amdgpu_uvd.c+= -Wno-format
+CWARNFLAGS.amdgpu_vcn.c+= -Wno-format
COPTS.amdgpu_dcn10_resource.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_dcn20_resource.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_dcn21_resource.c+= ${COPTS.amdgpu_float}
CVS commit: src/sys/modules/amdgpu
Module Name:src Committed By: tnn Date: Sat Jul 30 03:29:52 UTC 2022 Modified Files: src/sys/modules/amdgpu: Makefile Log Message: COPTS -> CWARNFLAGS To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/modules/amdgpu/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/amdgpu
Module Name:src Committed By: tnn Date: Sat Jul 30 03:26:45 UTC 2022 Modified Files: src/sys/modules/amdgpu: Makefile Log Message: amdgpu: add some more CWARNFLAGS to appease clang XXX backport this change to files.amdgpu To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/modules/amdgpu/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/amdgpu/Makefile diff -u src/sys/modules/amdgpu/Makefile:1.3 src/sys/modules/amdgpu/Makefile:1.4 --- src/sys/modules/amdgpu/Makefile:1.3 Sat Jul 30 03:12:00 2022 +++ src/sys/modules/amdgpu/Makefile Sat Jul 30 03:26:45 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/07/30 03:12:00 tnn Exp $ +# $NetBSD: Makefile,v 1.4 2022/07/30 03:26:45 tnn Exp $ .include "../Makefile.inc" .include "../drmkms/Makefile.inc" @@ -46,14 +46,19 @@ CWARNFLAGS+= -Wno-override-init # sed -ne 's,^makeoptions amdgpu "\([^"]*\.c\)"+="\(.*\)",\1+= \2,gp'
CVS commit: src/sys/modules/amdgpu
Module Name:src Committed By: tnn Date: Sat Jul 30 03:26:45 UTC 2022 Modified Files: src/sys/modules/amdgpu: Makefile Log Message: amdgpu: add some more CWARNFLAGS to appease clang XXX backport this change to files.amdgpu To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/modules/amdgpu/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/amdgpu
Module Name:src
Committed By: tnn
Date: Sat Jul 30 03:12:00 UTC 2022
Modified Files:
src/sys/modules/amdgpu: Makefile
Log Message:
amdgpu: don't set -mhard-float for clang
clang complains that the option has no effect and it generates hard
float instructions without the option. soft-float not really supported
on x86_64 with clang from what I can tell.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/amdgpu/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/amdgpu/Makefile
diff -u src/sys/modules/amdgpu/Makefile:1.2 src/sys/modules/amdgpu/Makefile:1.3
--- src/sys/modules/amdgpu/Makefile:1.2 Sun Jul 24 20:05:00 2022
+++ src/sys/modules/amdgpu/Makefile Sat Jul 30 03:12:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/07/24 20:05:00 riastradh Exp $
+# $NetBSD: Makefile,v 1.3 2022/07/30 03:12:00 tnn Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -10,7 +10,7 @@ MKLDSCRIPT=yes
WARNS= 3
.if ${MACHINE_ARCH} == "x86_64"
-COPTS.amdgpu_float+= -mhard-float -msse -msse2
+COPTS.amdgpu_float+= ${${ACTIVE_CC} == "gcc" :? -mhard-float :} -msse -msse2
.elif !empty(MACHINE_ARCH:Maarch64*)
COPTS.amdgpu_float+= -march=armv8-a
.endif
CVS commit: src/sys/modules/amdgpu
Module Name:src Committed By: tnn Date: Sat Jul 30 03:12:00 UTC 2022 Modified Files: src/sys/modules/amdgpu: Makefile Log Message: amdgpu: don't set -mhard-float for clang clang complains that the option has no effect and it generates hard float instructions without the option. soft-float not really supported on x86_64 with clang from what I can tell. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/amdgpu/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/drmkms_sched
Module Name:src
Committed By: riastradh
Date: Thu Jul 28 10:41:07 UTC 2022
Modified Files:
src/sys/modules/drmkms_sched: Makefile
Log Message:
drmkms_sched: Revert previous MKLDSCRIPT, red herring.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/drmkms_sched/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/drmkms_sched/Makefile
diff -u src/sys/modules/drmkms_sched/Makefile:1.2 src/sys/modules/drmkms_sched/Makefile:1.3
--- src/sys/modules/drmkms_sched/Makefile:1.2 Thu Jul 28 10:24:46 2022
+++ src/sys/modules/drmkms_sched/Makefile Thu Jul 28 10:41:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/07/28 10:24:46 riastradh Exp $
+# $NetBSD: Makefile,v 1.3 2022/07/28 10:41:07 riastradh Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -7,7 +7,6 @@
.PATH: ${S}/external/bsd/drm2/drm
KMOD= drmkms_sched
-MKLDSCRIPT=yes
SRCS+= sched_entity.c
SRCS+= sched_fence.c
CVS commit: src/sys/modules/drmkms_sched
Module Name:src Committed By: riastradh Date: Thu Jul 28 10:41:07 UTC 2022 Modified Files: src/sys/modules/drmkms_sched: Makefile Log Message: drmkms_sched: Revert previous MKLDSCRIPT, red herring. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/drmkms_sched/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/drmkms_sched
Module Name:src
Committed By: riastradh
Date: Thu Jul 28 10:24:46 UTC 2022
Modified Files:
src/sys/modules/drmkms_sched: Makefile
Log Message:
drmkms_sched: Fix link sets in module.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/drmkms_sched/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/drmkms_sched/Makefile
diff -u src/sys/modules/drmkms_sched/Makefile:1.1 src/sys/modules/drmkms_sched/Makefile:1.2
--- src/sys/modules/drmkms_sched/Makefile:1.1 Sat Jul 23 12:52:10 2022
+++ src/sys/modules/drmkms_sched/Makefile Thu Jul 28 10:24:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/07/23 12:52:10 riastradh Exp $
+# $NetBSD: Makefile,v 1.2 2022/07/28 10:24:46 riastradh Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -7,6 +7,7 @@
.PATH: ${S}/external/bsd/drm2/drm
KMOD= drmkms_sched
+MKLDSCRIPT=yes
SRCS+= sched_entity.c
SRCS+= sched_fence.c
CVS commit: src/sys/modules/drmkms_sched
Module Name:src Committed By: riastradh Date: Thu Jul 28 10:24:46 UTC 2022 Modified Files: src/sys/modules/drmkms_sched: Makefile Log Message: drmkms_sched: Fix link sets in module. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/drmkms_sched/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/drmkms
Module Name:src
Committed By: riastradh
Date: Wed Jul 20 01:11:39 UTC 2022
Modified Files:
src/sys/modules/drmkms: Makefile.inc
Log Message:
drm: Undefine `alpha' in the module build too.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/modules/drmkms/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/drmkms/Makefile.inc
diff -u src/sys/modules/drmkms/Makefile.inc:1.8 src/sys/modules/drmkms/Makefile.inc:1.9
--- src/sys/modules/drmkms/Makefile.inc:1.8 Sun Jul 17 15:05:09 2022
+++ src/sys/modules/drmkms/Makefile.inc Wed Jul 20 01:11:39 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2022/07/17 15:05:09 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.9 2022/07/20 01:11:39 riastradh Exp $
# Common makefile cruft for drm2 code.
@@ -31,6 +31,8 @@ CPPFLAGS+= -DCONFIG_X86_PAT
CPPFLAGS+= -DCONFIG_ARM
.elif ${MACHINE_ARCH} == "aarch64"
CPPFLAGS+= -DCONFIG_ARM64
+.elif ${MACHINE_ARCH} == "alpha"
+CPPFLAGS+= -Ualpha
.endif
CPPFLAGS+= -DCONFIG_BACKLIGHT_CLASS_DEVICE=0
CVS commit: src/sys/modules/drmkms
Module Name:src Committed By: riastradh Date: Wed Jul 20 01:11:39 UTC 2022 Modified Files: src/sys/modules/drmkms: Makefile.inc Log Message: drm: Undefine `alpha' in the module build too. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/modules/drmkms/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/drmkms
Module Name:src
Committed By: riastradh
Date: Sun Jul 17 15:35:42 UTC 2022
Modified Files:
src/sys/modules/drmkms: Makefile
Log Message:
drm: Include GPU scheduler in drmkms.kmod.
Could be split into a separate module, but whatever.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/modules/drmkms/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/drmkms/Makefile
diff -u src/sys/modules/drmkms/Makefile:1.17 src/sys/modules/drmkms/Makefile:1.18
--- src/sys/modules/drmkms/Makefile:1.17 Sun Jul 17 15:05:09 2022
+++ src/sys/modules/drmkms/Makefile Sun Jul 17 15:35:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2022/07/17 15:05:09 riastradh Exp $
+# $NetBSD: Makefile,v 1.18 2022/07/17 15:35:42 riastradh Exp $
.include "../Makefile.inc"
.include "Makefile.inc"
@@ -11,6 +11,7 @@ MKLDSCRIPT=yes
.PATH: ${S}/external/bsd/drm2/pci
.PATH: ${S}/external/bsd/drm2/dist/drm
+.PATH: ${S}/external/bsd/drm2/dist/drm/scheduler
# NetBSD additions.
SRCS+= drm_agp_hook.c
@@ -51,6 +52,11 @@ SRCS+= drm_legacy_misc.c
SRCS+= drm_lock.c
SRCS+= drm_scatter.c
+# GPU scheduler
+SRCS+= sched_entity.c
+SRCS+= sched_fence.c
+SRCS+= sched_main.c
+
# Upstream source files.
#SRCS+= drm_agpsupport.c
SRCS+= drm_atomic.c
CVS commit: src/sys/modules/drmkms
Module Name:src Committed By: riastradh Date: Sun Jul 17 15:35:42 UTC 2022 Modified Files: src/sys/modules/drmkms: Makefile Log Message: drm: Include GPU scheduler in drmkms.kmod. Could be split into a separate module, but whatever. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/modules/drmkms/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/drmkms
Module Name:src
Committed By: riastradh
Date: Sun Jul 17 15:05:09 UTC 2022
Modified Files:
src/sys/modules/drmkms: Makefile Makefile.inc
Log Message:
drm: Sync module/drmkms/Makefile with files.drmkms.
Unconditionally include legacy APIs for viadrmums.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/modules/drmkms/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/drmkms/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/drmkms/Makefile
diff -u src/sys/modules/drmkms/Makefile:1.16 src/sys/modules/drmkms/Makefile:1.17
--- src/sys/modules/drmkms/Makefile:1.16 Sun Jul 17 14:11:40 2022
+++ src/sys/modules/drmkms/Makefile Sun Jul 17 15:05:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2022/07/17 14:11:40 riastradh Exp $
+# $NetBSD: Makefile,v 1.17 2022/07/17 15:05:09 riastradh Exp $
.include "../Makefile.inc"
.include "Makefile.inc"
@@ -16,10 +16,10 @@ MKLDSCRIPT=yes
SRCS+= drm_agp_hook.c
SRCS+= drm_cdevsw.c
SRCS+= drm_gem_vm.c
-SRCS+= drm_hdcp.c
SRCS+= drm_module.c
SRCS+= drm_sysctl.c
+# pci bus ids -- doesn't depend on all of pci, just the header files
SRCS+= drm_pci_busid.c
# Generic, unaccelerated kms framebuffer.
@@ -27,9 +27,6 @@ SRCS+= drmfb.c
# XXX ttm
-# Code imported from Linux - expects signed overflow to be OK.
-COPTS+= -fwrapv
-
CPPFLAGS+= -I.
# XXX CWARNFLAGS.foo.c doesn't work.
@@ -46,8 +43,16 @@ COPTS.drm_ioctl.c+= -Wno-shadow
COPTS.drm_mm.c+= ${${ACTIVE_CC} == clang :? -Wno-unused-function :}
COPTS.drm_modes.c+= -Wno-shadow
+# Legacy user-mode setting
+SRCS+= drm_bufs.c
+SRCS+= drm_context.c
+SRCS+= drm_dma.c
+SRCS+= drm_legacy_misc.c
+SRCS+= drm_lock.c
+SRCS+= drm_scatter.c
+
# Upstream source files.
-#SRCS+= drm_agpsupport.c # Moved to drmkms_pci module.
+#SRCS+= drm_agpsupport.c
SRCS+= drm_atomic.c
SRCS+= drm_atomic_helper.c
SRCS+= drm_atomic_state_helper.c
@@ -73,6 +78,7 @@ SRCS+= drm_edid.c
SRCS+= drm_encoder.c
SRCS+= drm_encoder_slave.c
SRCS+= drm_fb_helper.c
+SRCS+= drm_file.c
SRCS+= drm_flip_work.c
#SRCS+= drm_format_helper.c
SRCS+= drm_fourcc.c
@@ -81,10 +87,9 @@ SRCS+= drm_gem.c
SRCS+= drm_gem_cma_helper.c
SRCS+= drm_gem_framebuffer_helper.c
SRCS+= drm_hashtab.c
-#SRCS+= drm_hdcp.c # Local override.
+SRCS+= drm_hdcp.c
SRCS+= drm_ioctl.c
SRCS+= drm_irq.c
-SRCS+= drm_lock.c
#SRCS+= drm_kms_helper_common.c
SRCS+= drm_lease.c
SRCS+= drm_memory.c
@@ -96,7 +101,7 @@ SRCS+= drm_modeset_helper.c
SRCS+= drm_modeset_lock.c
SRCS+= drm_panel.c
SRCS+= drm_panel_orientation_quirks.c
-#SRCS+= drm_pci.c # Moved to drmkms_pci module.
+#SRCS+= drm_pci.c
SRCS+= drm_plane.c
SRCS+= drm_plane_helper.c
SRCS+= drm_prime.c
Index: src/sys/modules/drmkms/Makefile.inc
diff -u src/sys/modules/drmkms/Makefile.inc:1.7 src/sys/modules/drmkms/Makefile.inc:1.8
--- src/sys/modules/drmkms/Makefile.inc:1.7 Sun Jul 17 14:11:40 2022
+++ src/sys/modules/drmkms/Makefile.inc Sun Jul 17 15:05:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2022/07/17 14:11:40 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.8 2022/07/17 15:05:09 riastradh Exp $
# Common makefile cruft for drm2 code.
@@ -43,5 +43,8 @@ CPPFLAGS+= -DCONFIG_PCI=1
CWARNFLAGS+= -Wno-missing-field-initializers
+# Needed for drmums modules.
+CPPFLAGS+= -DCONFIG_DRM_LEGACY
+
# XXX Is this the right place to set this?
CPPFLAGS+= -DDIAGNOSTIC
CVS commit: src/sys/modules/drmkms
Module Name:src Committed By: riastradh Date: Sun Jul 17 15:05:09 UTC 2022 Modified Files: src/sys/modules/drmkms: Makefile Makefile.inc Log Message: drm: Sync module/drmkms/Makefile with files.drmkms. Unconditionally include legacy APIs for viadrmums. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/modules/drmkms/Makefile cvs rdiff -u -r1.7 -r1.8 src/sys/modules/drmkms/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/acpiverbose
Module Name:src Committed By: mrg Date: Wed Jun 1 00:50:24 UTC 2022 Added Files: src/sys/modules/acpiverbose: pci.h Log Message: add now required pci.h / NPCI. (the ia64 version builds with PCI enabled, but i guess it won't be usable.) XXX: enable this on evbarm*? it is x86/ia64 only currently. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/modules/acpiverbose/pci.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/acpiverbose
Module Name:src Committed By: mrg Date: Wed Jun 1 00:50:24 UTC 2022 Added Files: src/sys/modules/acpiverbose: pci.h Log Message: add now required pci.h / NPCI. (the ia64 version builds with PCI enabled, but i guess it won't be usable.) XXX: enable this on evbarm*? it is x86/ia64 only currently. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/modules/acpiverbose/pci.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/modules/acpiverbose/pci.h diff -u /dev/null src/sys/modules/acpiverbose/pci.h:1.1 --- /dev/null Wed Jun 1 00:50:24 2022 +++ src/sys/modules/acpiverbose/pci.h Wed Jun 1 00:50:24 2022 @@ -0,0 +1 @@ +#define NPCI 1
CVS commit: src/sys/modules/if_wg
Module Name:src Committed By: jakllsch Date: Thu Jan 27 14:18:40 UTC 2022 Modified Files: src/sys/modules/if_wg: Makefile Log Message: Turn off ALTQ in if_wg module, to match default kernel configs To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/if_wg/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/if_wg/Makefile diff -u src/sys/modules/if_wg/Makefile:1.1 src/sys/modules/if_wg/Makefile:1.2 --- src/sys/modules/if_wg/Makefile:1.1 Tue Aug 17 17:29:20 2021 +++ src/sys/modules/if_wg/Makefile Thu Jan 27 14:18:40 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2021/08/17 17:29:20 christos Exp $ +# $NetBSD: Makefile,v 1.2 2022/01/27 14:18:40 jakllsch Exp $ .include "../Makefile.inc" @@ -10,7 +10,7 @@ SRCS= if_wg.c CPPFLAGS+= -DINET CPPFLAGS+= -DINET6 -CPPFLAGS+= -DALTQ +#CPPFLAGS+= -DALTQ WARNS= 3
CVS commit: src/sys/modules/if_wg
Module Name:src Committed By: jakllsch Date: Thu Jan 27 14:18:40 UTC 2022 Modified Files: src/sys/modules/if_wg: Makefile Log Message: Turn off ALTQ in if_wg module, to match default kernel configs To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/if_wg/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/ufs
Module Name:src Committed By: pgoyette Date: Sat Jan 8 02:00:49 UTC 2022 Modified Files: src/sys/modules/ufs: Makefile Log Message: Use += for SRCS list To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/modules/ufs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/ufs
Module Name:src
Committed By: pgoyette
Date: Sat Jan 8 02:00:49 UTC 2022
Modified Files:
src/sys/modules/ufs: Makefile
Log Message:
Use += for SRCS list
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/ufs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/ufs/Makefile
diff -u src/sys/modules/ufs/Makefile:1.6 src/sys/modules/ufs/Makefile:1.7
--- src/sys/modules/ufs/Makefile:1.6 Thu Jan 6 20:41:30 2022
+++ src/sys/modules/ufs/Makefile Sat Jan 8 02:00:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/06 20:41:30 pgoyette Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/08 02:00:49 pgoyette Exp $
.include "../Makefile.inc"
@@ -11,7 +11,7 @@ CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL
CWARNFLAGS.clang= -Wno-conversion
.PATH: ${S}/ufs/ufs
-SRCS= ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_inode.c \
+SRCS+= ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_inode.c \
ufs_lookup.c ufs_quota.c ufs_quota1.c ufs_quota2.c ufs_rename.c \
ufs_vfsops.c ufs_vnops.c quota1_subr.c quota2_subr.c
CVS commit: src/sys/modules/ffs
Module Name:src
Committed By: pgoyette
Date: Sat Jan 8 01:58:16 UTC 2022
Modified Files:
src/sys/modules/ffs: Makefile
Log Message:
Remove extra blank line
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/modules/ffs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.20 src/sys/modules/ffs/Makefile:1.21
--- src/sys/modules/ffs/Makefile:1.20 Sat Jan 8 01:50:54 2022
+++ src/sys/modules/ffs/Makefile Sat Jan 8 01:58:16 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2022/01/08 01:50:54 pgoyette Exp $
+# $NetBSD: Makefile,v 1.21 2022/01/08 01:58:16 pgoyette Exp $
.include "../Makefile.inc"
@@ -12,7 +12,6 @@ CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL
CWARNFLAGS.clang= -Wno-conversion
COPTS.ffs_appleufs.c+= ${NO_ADDR_OF_PACKED_MEMBER}
-
SRCS+= ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_subr.c ffs_tables.c \
ffs_vfsops.c ffs_vnops.c ffs_snapshot.c ffs_extattr.c \
ffs_bswap.c ffs_wapbl.c ffs_appleufs.c ffs_quota2.c
CVS commit: src/sys/modules/ffs
Module Name:src Committed By: pgoyette Date: Sat Jan 8 01:58:16 UTC 2022 Modified Files: src/sys/modules/ffs: Makefile Log Message: Remove extra blank line To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/modules/ffs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/ffs
Module Name:src
Committed By: pgoyette
Date: Sat Jan 8 01:50:54 UTC 2022
Modified Files:
src/sys/modules/ffs: Makefile
Log Message:
Use \t for pre-comment white-space
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/modules/ffs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.19 src/sys/modules/ffs/Makefile:1.20
--- src/sys/modules/ffs/Makefile:1.19 Thu Jan 6 15:08:56 2022
+++ src/sys/modules/ffs/Makefile Sat Jan 8 01:50:54 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/01/06 15:08:56 pgoyette Exp $
+# $NetBSD: Makefile,v 1.20 2022/01/08 01:50:54 pgoyette Exp $
.include "../Makefile.inc"
@@ -7,7 +7,7 @@
KMOD= ffs
CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL
-#CPPFLAGS+= -DUFS_DIRHASH # disabled - suspected of corrupting memory
+#CPPFLAGS+= -DUFS_DIRHASH # disabled - suspected of corrupting memory
CWARNFLAGS.clang= -Wno-conversion
COPTS.ffs_appleufs.c+= ${NO_ADDR_OF_PACKED_MEMBER}
CVS commit: src/sys/modules/ffs
Module Name:src Committed By: pgoyette Date: Sat Jan 8 01:50:54 UTC 2022 Modified Files: src/sys/modules/ffs: Makefile Log Message: Use \t for pre-comment white-space To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/modules/ffs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/ufs
Module Name:src Committed By: pgoyette Date: Thu Jan 6 20:41:31 UTC 2022 Modified Files: src/sys/modules/ufs: Makefile Log Message: Fix previous and actually disable UFS_DIRHASH To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/modules/ufs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/ufs
Module Name:src Committed By: pgoyette Date: Thu Jan 6 20:41:31 UTC 2022 Modified Files: src/sys/modules/ufs: Makefile Log Message: Fix previous and actually disable UFS_DIRHASH To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/modules/ufs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/ufs/Makefile diff -u src/sys/modules/ufs/Makefile:1.5 src/sys/modules/ufs/Makefile:1.6 --- src/sys/modules/ufs/Makefile:1.5 Thu Jan 6 15:08:56 2022 +++ src/sys/modules/ufs/Makefile Thu Jan 6 20:41:30 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/01/06 15:08:56 pgoyette Exp $ +# $NetBSD: Makefile,v 1.6 2022/01/06 20:41:30 pgoyette Exp $ .include "../Makefile.inc" @@ -6,7 +6,7 @@ KMOD= ufs CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2 CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -CPPFLAGS+= -DUFS_DIRHASH # disabled - suspected of corrupting memory +#CPPFLAGS+= -DUFS_DIRHASH # disabled - suspected of corrupting memory CWARNFLAGS.clang= -Wno-conversion
CVS commit: src/sys/modules
Module Name:src
Committed By: pgoyette
Date: Thu Jan 6 15:08:56 UTC 2022
Modified Files:
src/sys/modules/ffs: Makefile
src/sys/modules/ufs: Makefile
Log Message:
Since UFS_DIRHASH is explicitly disabled in GENERIC kernels (due to
being suspected of memory corruption), it should not be enabled in
the default module configurations either.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/modules/ffs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/ufs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.18 src/sys/modules/ffs/Makefile:1.19
--- src/sys/modules/ffs/Makefile:1.18 Sun Oct 18 19:56:41 2020
+++ src/sys/modules/ffs/Makefile Thu Jan 6 15:08:56 2022
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.18 2020/10/18 19:56:41 christos Exp $
+# $NetBSD: Makefile,v 1.19 2022/01/06 15:08:56 pgoyette Exp $
.include "../Makefile.inc"
.PATH: ${S}/ufs/ffs
KMOD= ffs
-CPPFLAGS+= -DUFS_DIRHASH -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
+CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL
+#CPPFLAGS+= -DUFS_DIRHASH # disabled - suspected of corrupting memory
CWARNFLAGS.clang= -Wno-conversion
COPTS.ffs_appleufs.c+= ${NO_ADDR_OF_PACKED_MEMBER}
Index: src/sys/modules/ufs/Makefile
diff -u src/sys/modules/ufs/Makefile:1.4 src/sys/modules/ufs/Makefile:1.5
--- src/sys/modules/ufs/Makefile:1.4 Sat May 16 18:31:52 2020
+++ src/sys/modules/ufs/Makefile Thu Jan 6 15:08:56 2022
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2020/05/16 18:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/06 15:08:56 pgoyette Exp $
.include "../Makefile.inc"
KMOD= ufs
-CPPFLAGS+= -DUFS_DIRHASH -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
+CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL
+CPPFLAGS+= -DUFS_DIRHASH # disabled - suspected of corrupting memory
CWARNFLAGS.clang= -Wno-conversion
CVS commit: src/sys/modules
Module Name:src Committed By: pgoyette Date: Thu Jan 6 15:08:56 UTC 2022 Modified Files: src/sys/modules/ffs: Makefile src/sys/modules/ufs: Makefile Log Message: Since UFS_DIRHASH is explicitly disabled in GENERIC kernels (due to being suspected of memory corruption), it should not be enabled in the default module configurations either. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/modules/ffs/Makefile cvs rdiff -u -r1.4 -r1.5 src/sys/modules/ufs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/viadrmums
Module Name:src Committed By: riastradh Date: Sun Dec 19 16:01:29 UTC 2021 Modified Files: src/sys/modules/viadrmums: Makefile Log Message: Fix i386 modules build: viadrmums requires CONFIG_DRM_LEGACY. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/modules/viadrmums/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/viadrmums
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 16:01:29 UTC 2021
Modified Files:
src/sys/modules/viadrmums: Makefile
Log Message:
Fix i386 modules build: viadrmums requires CONFIG_DRM_LEGACY.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/viadrmums/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/viadrmums/Makefile
diff -u src/sys/modules/viadrmums/Makefile:1.4 src/sys/modules/viadrmums/Makefile:1.5
--- src/sys/modules/viadrmums/Makefile:1.4 Sun Sep 29 23:45:00 2019
+++ src/sys/modules/viadrmums/Makefile Sun Dec 19 16:01:29 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/09/29 23:45:00 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2021/12/19 16:01:29 riastradh Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -9,6 +9,8 @@ IOCONF= viadrmums.ioconf
CPPFLAGS+= -I${S}/external/bsd/drm2/dist/drm/via
CPPFLAGS+= -I${S}/external/bsd/drm2/via
+CPPFLAGS+= -DCONFIG_DRM_LEGACY
+
.PATH: ${S}/external/bsd/drm2/via
.PATH: ${S}/external/bsd/drm2/dist/drm/via
CVS commit: src/sys/modules/amdgpu
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 12:39:09 UTC 2021
Added Files:
src/sys/modules/amdgpu: Makefile amdgpu.ioconf
Log Message:
amdgpu: New kernel module build goo.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/amdgpu/Makefile \
src/sys/modules/amdgpu/amdgpu.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/modules/amdgpu/Makefile
diff -u /dev/null src/sys/modules/amdgpu/Makefile:1.1
--- /dev/null Sun Dec 19 12:39:10 2021
+++ src/sys/modules/amdgpu/Makefile Sun Dec 19 12:39:09 2021
@@ -0,0 +1,552 @@
+# $NetBSD: Makefile,v 1.1 2021/12/19 12:39:09 riastradh Exp $
+
+.include "../Makefile.inc"
+.include "../drmkms/Makefile.inc"
+
+KMOD= amdgpu
+IOCONF= amdgpu.ioconf
+MKLDSCRIPT=yes
+
+WARNS= 3
+
+.if ${MACHINE_ARCH} == "x86_64"
+COPTS.amdgpu_float+= -mhard-float -msse -msse2
+.elif !empty(MACHINE_ARCH:Maarch64*)
+COPTS.amdgpu_float+= -march=armv8-a
+.endif
+
+# sed -ne 's,^makeoptions amdgpu "\([^.]*\)\.amdgpu"+="\(.*\)",\1+= \2,gp'
+
+# XXX
+CFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Index: src/sys/modules/amdgpu/amdgpu.ioconf
diff -u /dev/null src/sys/modules/amdgpu/amdgpu.ioconf:1.1
--- /dev/null Sun Dec 19 12:39:10 2021
+++ src/sys/modules/amdgpu/amdgpu.ioconf Sun Dec 19 12:39:09 2021
@@ -0,0 +1,12 @@
+# $NetBSD: amdgpu.ioconf,v 1.1 2021/12/19 12:39:09 riastradh Exp $
+
+ioconf amdgpu
+
+include "conf/files"
+include "dev/pci/files.pci"
+
+pseudo-root pci*
+pseudo-root amdgpufbbus*
+
+amdgpu* at pci? dev ? function ?
+amdgpufb* at amdgpufbbus?
CVS commit: src/sys/modules/amdgpu
Module Name:src Committed By: riastradh Date: Sun Dec 19 12:39:09 UTC 2021 Added Files: src/sys/modules/amdgpu: Makefile amdgpu.ioconf Log Message: amdgpu: New kernel module build goo. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/modules/amdgpu/Makefile \ src/sys/modules/amdgpu/amdgpu.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 11:54:25 UTC 2021
Modified Files:
src/sys/modules/drmkms: Makefile Makefile.inc
src/sys/modules/drmkms_linux: Makefile
src/sys/modules/drmkms_pci: Makefile
Log Message:
drm: Sync (device-independent) drmkms*.kmod makefiles.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/modules/drmkms/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/drmkms/Makefile.inc
cvs rdiff -u -r1.13 -r1.14 src/sys/modules/drmkms_linux/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/modules/drmkms_pci/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/drmkms/Makefile
diff -u src/sys/modules/drmkms/Makefile:1.14 src/sys/modules/drmkms/Makefile:1.15
--- src/sys/modules/drmkms/Makefile:1.14 Thu Jun 3 15:59:04 2021
+++ src/sys/modules/drmkms/Makefile Sun Dec 19 11:54:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/06/03 15:59:04 nia Exp $
+# $NetBSD: Makefile,v 1.15 2021/12/19 11:54:24 riastradh Exp $
.include "../Makefile.inc"
.include "Makefile.inc"
@@ -15,11 +15,13 @@ MKLDSCRIPT=yes
# NetBSD additions.
SRCS+= drm_agp_hook.c
SRCS+= drm_cdevsw.c
-SRCS+= drm_gem_cma_helper.c
SRCS+= drm_gem_vm.c
+SRCS+= drm_hdcp.c
SRCS+= drm_module.c
SRCS+= drm_sysctl.c
+SRCS+= drm_pci_busid.c
+
# Generic, unaccelerated kms framebuffer.
SRCS+= drmfb.c
@@ -36,54 +38,82 @@ COPTS.drm_bufs.c+= -Wno-pointer-arith
COPTS.drm_crtc.c+= -Wno-missing-field-initializers
COPTS.drm_crtc.c+= -Wno-pointer-arith
COPTS.drm_crtc.c+= -Wno-shadow
+COPTS.drm_client_modeset.c+= -Wno-shadow
COPTS.drm_dp_helper.c+= -Wno-pointer-arith
+COPTS.drm_fb_helper.c+= -Wno-shadow
+COPTS.drm_edid.c+= -Wno-error=attributes
COPTS.drm_edid.c+= -Wno-shadow
COPTS.drm_ioctl.c+= -Wno-shadow
+COPTS.drm_modes.c+= -Wno-shadow
# Upstream source files.
-#SRCS+= ati_pcigart.c # Moved to drmkms_pci module.
#SRCS+= drm_agpsupport.c # Moved to drmkms_pci module.
SRCS+= drm_atomic.c
SRCS+= drm_atomic_helper.c
+SRCS+= drm_atomic_state_helper.c
+SRCS+= drm_atomic_uapi.c
SRCS+= drm_auth.c
+SRCS+= drm_blend.c
SRCS+= drm_bridge.c
-SRCS+= drm_bufs.c
SRCS+= drm_cache.c
-SRCS+= drm_context.c
+SRCS+= drm_client.c
+SRCS+= drm_client_modeset.c
+SRCS+= drm_color_mgmt.c
+SRCS+= drm_connector.c
SRCS+= drm_crtc.c
SRCS+= drm_crtc_helper.c
-SRCS+= drm_debugfs.c
-SRCS+= drm_dma.c
+SRCS+= drm_damage_helper.c
+SRCS+= drm_dp_dual_mode_helper.c
SRCS+= drm_dp_helper.c
SRCS+= drm_dp_mst_topology.c
SRCS+= drm_drv.c
+SRCS+= drm_dsc.c
+SRCS+= drm_dumb_buffers.c
SRCS+= drm_edid.c
+SRCS+= drm_encoder.c
SRCS+= drm_encoder_slave.c
SRCS+= drm_fb_helper.c
SRCS+= drm_flip_work.c
-SRCS+= drm_fops.c
+#SRCS+= drm_format_helper.c
+SRCS+= drm_fourcc.c
+SRCS+= drm_framebuffer.c
SRCS+= drm_gem.c
-SRCS+= drm_global.c
+SRCS+= drm_gem_cma_helper.c
+SRCS+= drm_gem_framebuffer_helper.c
SRCS+= drm_hashtab.c
-#SRCS+= drm_info.c # XXX Rewrite for sysctl or something.
+#SRCS+= drm_hdcp.c # Local override.
SRCS+= drm_ioctl.c
SRCS+= drm_irq.c
SRCS+= drm_lock.c
+#SRCS+= drm_kms_helper_common.c
+SRCS+= drm_lease.c
SRCS+= drm_memory.c
SRCS+= drm_mm.c
+SRCS+= drm_mode_config.c
+SRCS+= drm_mode_object.c
SRCS+= drm_modes.c
+SRCS+= drm_modeset_helper.c
SRCS+= drm_modeset_lock.c
+SRCS+= drm_panel.c
+SRCS+= drm_panel_orientation_quirks.c
#SRCS+= drm_pci.c # Moved to drmkms_pci module.
+SRCS+= drm_plane.c
SRCS+= drm_plane_helper.c
-#SRCS+= drm_platform.c # XXX Rewrite per platform.
-#SRCS+= drm_prime.c # XXX Revisit later.
+SRCS+= drm_prime.c
+SRCS+= drm_print.c
SRCS+= drm_probe_helper.c
+SRCS+= drm_property.c
SRCS+= drm_rect.c
-SRCS+= drm_scatter.c
+SRCS+= drm_scdc_helper.c
+SRCS+= drm_self_refresh_helper.c
+#SRCS+= drm_simple_kms_helper.c
+SRCS+= drm_syncobj.c
SRCS+= drm_sysfs.c
SRCS+= drm_trace_points.c
+SRCS+= drm_vblank.c
SRCS+= drm_vm.c
SRCS+= drm_vma_manager.c
+SRCS+= drm_writeback.c
WARNS= 3
Index: src/sys/modules/drmkms/Makefile.inc
diff -u src/sys/modules/drmkms/Makefile.inc:1.5 src/sys/modules/drmkms/Makefile.inc:1.6
--- src/sys/modules/drmkms/Makefile.inc:1.5 Mon Aug 27 13:53:42 2018
+++ src/sys/modules/drmkms/Makefile.inc Sun Dec 19 11:54:24 2021
@@ -1,33 +1,47 @@
-# $NetBSD: Makefile.inc,v 1.5 2018/08/27 13:53:42 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.6 2021/12/19 11:54:24 riastradh Exp $
# Common makefile cruft for drm2 code.
# XXX All the -D crap needs to go in a header file instead so changing
# it correctly triggers rebuilds.
+COPTS+= -fwrapv
+
# Overrides first.
CPPFLAGS+= -I${S}/external/bsd/drm2/include
+CPPFLAGS+= -I${S}/external/bsd/drm2/include/drm
CPPFLAGS+= -I${S}/external/bsd/common/include
# Then upstream.
CPPFLAGS+= -I${S}/external/bsd/drm2/dist/include
CPPFLAGS+= -I${S}/external/bsd/drm2/dist/include/drm
-CPPFLAGS+= -I${S}/external/bsd/drm2/dist/uapi
-
-# Must come last because some header file
CVS commit: src/sys/modules
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:54:25 UTC 2021 Modified Files: src/sys/modules/drmkms: Makefile Makefile.inc src/sys/modules/drmkms_linux: Makefile src/sys/modules/drmkms_pci: Makefile Log Message: drm: Sync (device-independent) drmkms*.kmod makefiles. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/modules/drmkms/Makefile cvs rdiff -u -r1.5 -r1.6 src/sys/modules/drmkms/Makefile.inc cvs rdiff -u -r1.13 -r1.14 src/sys/modules/drmkms_linux/Makefile cvs rdiff -u -r1.9 -r1.10 src/sys/modules/drmkms_pci/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/i915drmkms
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:03:42 UTC 2021 Modified Files: src/sys/modules/i915drmkms: Makefile Log Message: Suppress some harmless clang warnings. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/modules/i915drmkms/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/i915drmkms/Makefile diff -u src/sys/modules/i915drmkms/Makefile:1.18 src/sys/modules/i915drmkms/Makefile:1.19 --- src/sys/modules/i915drmkms/Makefile:1.18 Thu Jun 3 15:59:04 2021 +++ src/sys/modules/i915drmkms/Makefile Sun Dec 19 01:03:42 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2021/06/03 15:59:04 nia Exp $ +# $NetBSD: Makefile,v 1.19 2021/12/19 01:03:42 riastradh Exp $ .include "../Makefile.inc" .include "../drmkms/Makefile.inc" @@ -26,6 +26,8 @@ CPPFLAGS+= -DNVGA=1 CWARNFLAGS+= -Wno-shadow CWARNFLAGS+= -Wno-pointer-arith +CWARNFLAGS.clang+= -Wno-error=enum-conversion +CWARNFLAGS.clang+= -Wno-error=unused-function # Code imported from Linux - expects signed overflow to be OK. COPTS+= -fwrapv
CVS commit: src/sys/modules/i915drmkms
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:03:42 UTC 2021 Modified Files: src/sys/modules/i915drmkms: Makefile Log Message: Suppress some harmless clang warnings. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/modules/i915drmkms/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/compat_linux32
Module Name:src
Committed By: ryo
Date: Sat Nov 27 05:36:39 UTC 2021
Modified Files:
src/sys/modules/compat_linux32: Makefile
Log Message:
fix build for aarch64eb
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/modules/compat_linux32/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/compat_linux32/Makefile
diff -u src/sys/modules/compat_linux32/Makefile:1.10 src/sys/modules/compat_linux32/Makefile:1.11
--- src/sys/modules/compat_linux32/Makefile:1.10 Thu Nov 25 03:08:05 2021
+++ src/sys/modules/compat_linux32/Makefile Sat Nov 27 05:36:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/11/25 03:08:05 ryo Exp $
+# $NetBSD: Makefile,v 1.11 2021/11/27 05:36:39 ryo Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@@ -17,7 +17,7 @@ SRCS+= linux32_socket.c linux32_socketca
SRCS+= linux32_sysinfo.c linux32_termios.c linux32_time.c
SRCS+= linux32_unistd.c linux32_utsname.c linux32_wait.c
-.if ${MACHINE_ARCH} == "aarch64"
+.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "aarch64eb"
CPPFLAGS+= -DEXEC_ELF32
.PATH: ${S}/compat/linux32/arch/aarch64
SRCS+= linux32_exec_machdep.c linux32_ipccall.c linux32_machdep.c
CVS commit: src/sys/modules/compat_linux32
Module Name:src Committed By: ryo Date: Sat Nov 27 05:36:39 UTC 2021 Modified Files: src/sys/modules/compat_linux32: Makefile Log Message: fix build for aarch64eb To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/modules/compat_linux32/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/sodium
Module Name:src
Committed By: christos
Date: Sat Aug 21 09:07:08 UTC 2021
Modified Files:
src/sys/modules/sodium: Makefile.sodmod
Log Message:
rename glue.c to sodium_module.c
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/sodium/Makefile.sodmod
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/sodium/Makefile.sodmod
diff -u src/sys/modules/sodium/Makefile.sodmod:1.2 src/sys/modules/sodium/Makefile.sodmod:1.3
--- src/sys/modules/sodium/Makefile.sodmod:1.2 Wed Aug 18 05:34:45 2021
+++ src/sys/modules/sodium/Makefile.sodmod Sat Aug 21 05:07:08 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.sodmod,v 1.2 2021/08/18 09:34:45 christos Exp $
+# $NetBSD: Makefile.sodmod,v 1.3 2021/08/21 09:07:08 christos Exp $
SODIUMDIR= ${S}/external/isc/libsodium
SODIUMSRCDIR= ${SODIUMDIR}/dist/src/libsodium
.PATH: ${SODIUMDIR}/src
-SRCS+= glue.c
+SRCS+= sodium_module.c
.PATH: ${SODIUMSRCDIR}/crypto_scalarmult/curve25519/ref10
SRCS+= x25519_ref10.c
CVS commit: src/sys/modules/sodium
Module Name:src Committed By: christos Date: Sat Aug 21 09:07:08 UTC 2021 Modified Files: src/sys/modules/sodium: Makefile.sodmod Log Message: rename glue.c to sodium_module.c To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/sodium/Makefile.sodmod Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/modules/lua
On 2021/08/09 7:26, Rin Okuyama wrote: - Initialize LIST_HEAD. Hmm, since HEADs are static, this is not necessary. But, it should be a good practice to initialize HEADs always, IMO... Thanks, rin
Re: CVS commit: src/sys/modules/compat_netbsd32
I almost got a heart attack between your first email and your second one,
wondering how this code got re-enabled. Thanks for clarifying.
Relevant example, by the way.
Committed on August 20th 2019 at 09:32
https://mail-index.netbsd.org/source-changes/2019/08/20/msg108321.html
Disabled by me the same day at 12:25
https://mail-index.netbsd.org/source-changes/2019/08/20/msg108332.html
No rocket science here, I just saw that the code qualified as close to
structurally deficient, and went ahead. In case you people are wondering,
I think I did it with strictly no discussion.
Unsurprisingly, it looks like it has saved us a lot of trouble here.
This is what sane policy looks like.
Le 19/04/2020 à 19:58, m...@netbsd.org a écrit :
> Good news everyone. Does not affect any release at all.
> Also might not have been a security issue, because christos did a weird
> thing where it is compiled but somehow still disabled.
>
> On Sun, Apr 19, 2020 at 05:40:50PM +, Maya Rashish wrote:
>> Module Name: src
>> Committed By:maya
>> Date:Sun Apr 19 17:40:50 UTC 2020
>>
>> Modified Files:
>> src/sys/modules/compat_netbsd32: Makefile
>>
>> Log Message:
>> Turn off compat drm.
>> XXX issue security advisory
>>
>>
>> To generate a diff of this commit:
>> cvs rdiff -u -r1.32 -r1.33 src/sys/modules/compat_netbsd32/Makefile
>>
>> Please note that diffs are not public domain; they are subject to the
>> copyright notices on the relevant files.
>>
>
>> Modified files:
>>
>> Index: src/sys/modules/compat_netbsd32/Makefile
>> diff -u src/sys/modules/compat_netbsd32/Makefile:1.32
>> src/sys/modules/compat_netbsd32/Makefile:1.33
>> --- src/sys/modules/compat_netbsd32/Makefile:1.32Thu Mar 12 15:02:29 2020
>> +++ src/sys/modules/compat_netbsd32/Makefile Sun Apr 19 17:40:49 2020
>> @@ -1,13 +1,13 @@
>> -# $NetBSD: Makefile,v 1.32 2020/03/12 15:02:29 pgoyette Exp $
>> +# $NetBSD: Makefile,v 1.33 2020/04/19 17:40:49 maya Exp $
>>
>> .include "../Makefile.inc"
>> .include "../Makefile.assym"
>>
>> KMOD= compat_netbsd32
>>
>> -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
>> -NETBSD32_DRMKMS?=yes
>> -.endif
>> +#.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
>> +#NETBSD32_DRMKMS?=yes
>> +#.endif
>>
>> CPPFLAGS+= -DCOMPAT_NETBSD32
>> CPPFLAGS+= -DEXEC_ELF32 -DEXEC_ELF64
Re: CVS commit: src/sys/modules/compat_netbsd32
Good news everyone. Does not affect any release at all.
Also might not have been a security issue, because christos did a weird
thing where it is compiled but somehow still disabled.
On Sun, Apr 19, 2020 at 05:40:50PM +, Maya Rashish wrote:
> Module Name: src
> Committed By: maya
> Date: Sun Apr 19 17:40:50 UTC 2020
>
> Modified Files:
> src/sys/modules/compat_netbsd32: Makefile
>
> Log Message:
> Turn off compat drm.
> XXX issue security advisory
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.32 -r1.33 src/sys/modules/compat_netbsd32/Makefile
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
>
> Modified files:
>
> Index: src/sys/modules/compat_netbsd32/Makefile
> diff -u src/sys/modules/compat_netbsd32/Makefile:1.32
> src/sys/modules/compat_netbsd32/Makefile:1.33
> --- src/sys/modules/compat_netbsd32/Makefile:1.32 Thu Mar 12 15:02:29 2020
> +++ src/sys/modules/compat_netbsd32/Makefile Sun Apr 19 17:40:49 2020
> @@ -1,13 +1,13 @@
> -#$NetBSD: Makefile,v 1.32 2020/03/12 15:02:29 pgoyette Exp $
> +#$NetBSD: Makefile,v 1.33 2020/04/19 17:40:49 maya Exp $
>
> .include "../Makefile.inc"
> .include "../Makefile.assym"
>
> KMOD=compat_netbsd32
>
> -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
> -NETBSD32_DRMKMS?=yes
> -.endif
> +#.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
> +#NETBSD32_DRMKMS?=yes
> +#.endif
>
> CPPFLAGS+= -DCOMPAT_NETBSD32
> CPPFLAGS+= -DEXEC_ELF32 -DEXEC_ELF64
>
Re: CVS commit: src/sys/modules/examples/fopsmapper
> Date: Wed, 1 Apr 2020 07:42:53 -0700
> From: Jason Thorpe
>
> If PAGE_SIZE is ostensibly a vsize_t / size_t, why not define it as (1U <<
> PAGE_SHIFT)?
Without running the following program, can you tell me what it will
print?
It might work to define PAGE_SIZE to be ((size_t)1 << PAGE_SHIFT) but
the consequences are not immediately clear to me (and might be tricky
on, e.g., i386pae).
#include
#include
#include
#define PAGE_SIZE_S (1 << 12)
#define PAGE_SIZE_U (1u << 12)
uint64_taddr = 0x7fff01234567;
int
main(void)
{
printf("%"PRIx64"\n", addr & ~(PAGE_SIZE_S - 1));
printf("%"PRIx64"\n", addr & ~(PAGE_SIZE_U - 1));
fflush(stdout);
return ferror(stdout);
}
Re: CVS commit: src/sys/modules/examples/fopsmapper
I think that PAGESIZE is not always a constant in our code. christos signature.asc Description: Message signed with OpenPGP
Re: CVS commit: src/sys/modules/examples/fopsmapper
Date:Wed, 1 Apr 2020 16:31:01 +0200 From:Kamil Rytarowski Message-ID: | Does it look better? | | http://netbsd.org/~kamil/patch-00244-fopsmapper-PAGE_SIZE.txt Apart from it needing to be (expressed in the relevant make syntax, whatever that is) if (WARNS > 3) WARNE=3 rather than simply WARNS=3 then as a hack type fix that looks fine. But this is really a gcc bug, we shouldn't be needing to change our sources at all because of this. The signed vs unsigned comparison warning is because if the signed number happens to be negative, when treated as unsigned it will compare larger (usually) than the unsigned value - whereas most people expect negative numbers to be less than positive ones (whatever the magnitudes). Warning for that potential problem is entirely reasonable. But here we have a known positive (though signed) constant. It can never magically become negative, and so the problem can never exist. There should not (ever) be a warning for this case, it is simply stupid, and we should not need to modify either code, or makefiles, to make it go away. kre
Re: CVS commit: src/sys/modules/examples/fopsmapper
> If PAGE_SIZE is ostensibly a vsize_t / size_t, why not define it as (1U << > PAGE_SHIFT)? It will *probably* work unless we have 'if (negative_int > PAGESIZE)' somewhere. I guess if you make the change and the kernel boots... :-) christos signature.asc Description: Message signed with OpenPGP
Re: CVS commit: src/sys/modules/examples/fopsmapper
> On Apr 1, 2020, at 7:17 AM, Christos Zoulas wrote: > > Which we have been slowly fixing. I think in this case the sign-compare > warnings are annoying, but putting casts on each warning is cluttering > the code needlessly. Unfortunately the alternative (to make the PAGESIZE > constant unsigned is more dangerous -- unless of course you are willing to > examine all the places it is used and make sure that the semantics don't > change). Another way would be to make: > >#define PAGESIZE_U ((unsigned)PAGESIZE) If PAGE_SIZE is ostensibly a vsize_t / size_t, why not define it as (1U << PAGE_SHIFT)? -- thorpej
Re: CVS commit: src/sys/modules/examples/fopsmapper
On 01.04.2020 16:17, Christos Zoulas wrote: > In article , > Paul Goyette wrote: >> On Wed, 1 Apr 2020, Kamil Rytarowski wrote: >> >>> On 01.04.2020 15:47, Robert Elz wrote: Date:Wed, 1 Apr 2020 11:45:53 + From:"Kamil Rytarowski" Message-ID: <20200401114554.05167f...@cvs.netbsd.org> | Log Message: | Avoid comparison between signed and unsigned integer | | Cast PAGE_SIZE to size_t. This kind of pedantry is going way too far, PAGE_SIZE is a compile time constant (1 << PAGE_SHIFT) which is an int (and so signed, nominally) but one which is known to be positive. >>> >>> I got reports that certain ports no longer build due to: >>> >>> src/sys/modules/examples/fopsmapper/fopsmapper.c:118:11: error: >>> comparison between signed and unsigned integer expressions >>> [-Werror=sign-compare] >>> if (size != PAGE_SIZE) >>> ^~ >>> cc1: all warnings being treated as errors >> >> >> There's a lot of modules that fail for this with WARNS=5 when being >> built as loadable modules. >> >> That's why so many of the individual module Makefiles have explicit >> WARNS=4. (It seems that when modules are built-in as part of the >> kernel, they are by default built with WARNS=4.) > > Which we have been slowly fixing. I think in this case the sign-compare > warnings are annoying, but putting casts on each warning is cluttering > the code needlessly. Unfortunately the alternative (to make the PAGESIZE > constant unsigned is more dangerous -- unless of course you are willing to > examine all the places it is used and make sure that the semantics don't > change). Another way would be to make: > > #define PAGESIZE_U ((unsigned)PAGESIZE) > > and use that instead; eventually when all instances of PAGESIZE have been > converted to PAGESIZE_U it can be removed. But is it worth it? There are > perhaps better things to do. But anyway you want to proceed should be > discussed in tech-kern. Adding piecemeal casts everywhere does not make > the world a better place. > > christos > Does it look better? http://netbsd.org/~kamil/patch-00244-fopsmapper-PAGE_SIZE.txt Perhaps we could switch PAGE_SIZE to unsigned.. but it is too much for now.
Re: CVS commit: src/sys/modules/examples/fopsmapper
In article , Paul Goyette wrote: >On Wed, 1 Apr 2020, Kamil Rytarowski wrote: > >> On 01.04.2020 15:47, Robert Elz wrote: >>> Date:Wed, 1 Apr 2020 11:45:53 + >>> From:"Kamil Rytarowski" >>> Message-ID: <20200401114554.05167f...@cvs.netbsd.org> >>> >>> | Log Message: >>> | Avoid comparison between signed and unsigned integer >>> | >>> | Cast PAGE_SIZE to size_t. >>> >>> This kind of pedantry is going way too far, PAGE_SIZE is a compile >>> time constant (1 << PAGE_SHIFT) which is an int (and so signed, >>> nominally) but one which is known to be positive. >>> >> >> I got reports that certain ports no longer build due to: >> >> src/sys/modules/examples/fopsmapper/fopsmapper.c:118:11: error: >> comparison between signed and unsigned integer expressions >> [-Werror=sign-compare] >> if (size != PAGE_SIZE) >> ^~ >> cc1: all warnings being treated as errors > > >There's a lot of modules that fail for this with WARNS=5 when being >built as loadable modules. > >That's why so many of the individual module Makefiles have explicit >WARNS=4. (It seems that when modules are built-in as part of the >kernel, they are by default built with WARNS=4.) Which we have been slowly fixing. I think in this case the sign-compare warnings are annoying, but putting casts on each warning is cluttering the code needlessly. Unfortunately the alternative (to make the PAGESIZE constant unsigned is more dangerous -- unless of course you are willing to examine all the places it is used and make sure that the semantics don't change). Another way would be to make: #define PAGESIZE_U ((unsigned)PAGESIZE) and use that instead; eventually when all instances of PAGESIZE have been converted to PAGESIZE_U it can be removed. But is it worth it? There are perhaps better things to do. But anyway you want to proceed should be discussed in tech-kern. Adding piecemeal casts everywhere does not make the world a better place. christos
Re: CVS commit: src/sys/modules/examples/fopsmapper
On 01.04.2020 16:10, Paul Goyette wrote: > On Wed, 1 Apr 2020, Kamil Rytarowski wrote: > >> On 01.04.2020 15:47, Robert Elz wrote: >>> Date: Wed, 1 Apr 2020 11:45:53 + >>> From: "Kamil Rytarowski" >>> Message-ID: <20200401114554.05167f...@cvs.netbsd.org> >>> >>> | Log Message: >>> | Avoid comparison between signed and unsigned integer >>> | >>> | Cast PAGE_SIZE to size_t. >>> >>> This kind of pedantry is going way too far, PAGE_SIZE is a compile >>> time constant (1 << PAGE_SHIFT) which is an int (and so signed, >>> nominally) but one which is known to be positive. >>> >> >> I got reports that certain ports no longer build due to: >> >> src/sys/modules/examples/fopsmapper/fopsmapper.c:118:11: error: >> comparison between signed and unsigned integer expressions >> [-Werror=sign-compare] >> if (size != PAGE_SIZE) >> ^~ >> cc1: all warnings being treated as errors > > > There's a lot of modules that fail for this with WARNS=5 when being > built as loadable modules. > > That's why so many of the individual module Makefiles have explicit > WARNS=4. (It seems that when modules are built-in as part of the > kernel, they are by default built with WARNS=4.) > I tracked it to WARNS=3 # Rather than our usual WARNS=5, we need to use 3, since there are a # lot of signed-vs-unsigned compares WARNS= 3 Personally I have got no preference. I'm fine with an explicit cast as it is in a single place only needed (hopefully).
Re: CVS commit: src/sys/modules/examples/fopsmapper
On Wed, 1 Apr 2020, Kamil Rytarowski wrote: On 01.04.2020 15:47, Robert Elz wrote: Date:Wed, 1 Apr 2020 11:45:53 + From:"Kamil Rytarowski" Message-ID: <20200401114554.05167f...@cvs.netbsd.org> | Log Message: | Avoid comparison between signed and unsigned integer | | Cast PAGE_SIZE to size_t. This kind of pedantry is going way too far, PAGE_SIZE is a compile time constant (1 << PAGE_SHIFT) which is an int (and so signed, nominally) but one which is known to be positive. I got reports that certain ports no longer build due to: src/sys/modules/examples/fopsmapper/fopsmapper.c:118:11: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] if (size != PAGE_SIZE) ^~ cc1: all warnings being treated as errors There's a lot of modules that fail for this with WARNS=5 when being built as loadable modules. That's why so many of the individual module Makefiles have explicit WARNS=4. (It seems that when modules are built-in as part of the kernel, they are by default built with WARNS=4.) ++--+---+ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired) | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com | | Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org | ++--+---+
Re: CVS commit: src/sys/modules/examples/fopsmapper
On 01.04.2020 15:47, Robert Elz wrote: > Date:Wed, 1 Apr 2020 11:45:53 + > From:"Kamil Rytarowski" > Message-ID: <20200401114554.05167f...@cvs.netbsd.org> > > | Log Message: > | Avoid comparison between signed and unsigned integer > | > | Cast PAGE_SIZE to size_t. > > This kind of pedantry is going way too far, PAGE_SIZE is a compile > time constant (1 << PAGE_SHIFT) which is an int (and so signed, > nominally) but one which is known to be positive. > I got reports that certain ports no longer build due to: src/sys/modules/examples/fopsmapper/fopsmapper.c:118:11: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] if (size != PAGE_SIZE) ^~ cc1: all warnings being treated as errors
Re: CVS commit: src/sys/modules/examples/fopsmapper
Date:Wed, 1 Apr 2020 11:45:53 + From:"Kamil Rytarowski" Message-ID: <20200401114554.05167f...@cvs.netbsd.org> | Log Message: | Avoid comparison between signed and unsigned integer | | Cast PAGE_SIZE to size_t. This kind of pedantry is going way too far, PAGE_SIZE is a compile time constant (1 << PAGE_SHIFT) which is an int (and so signed, nominally) but one which is known to be positive. What is to be next? Given an unsigned var (any unsigned type) 'u' are we going to be required to write if (u != 0U) or if (u != (unsigned)0) instead of just if (u != 0) ? Get rid of the cast, it isn't needed in this case, and anything that believes it is, is wrong (broken). kre
