CVS commit: src/tools
Module Name:src
Committed By: gutteridge
Date: Thu May 23 02:50:47 UTC 2024
Modified Files:
src/tools: Makefile
Log Message:
Add mkubootimage to riscv tools
To generate a diff of this commit:
cvs rdiff -u -r1.219 -r1.220 src/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.219 src/tools/Makefile:1.220
--- src/tools/Makefile:1.219 Mon Apr 1 02:22:38 2024
+++ src/tools/Makefile Thu May 23 02:50:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.219 2024/04/01 02:22:38 christos Exp $
+# $NetBSD: Makefile,v 1.220 2024/05/23 02:50:47 gutteridge Exp $
.include
.include
@@ -219,14 +219,9 @@ SUBDIR+= elftosb
.if ${MACHINE} == "evbarm" || ${MACHINE} == "evbmips" || \
${MACHINE} == "evbppc" || ${MACHINE} == "evbsh3" || \
-${MACHINE} == "sandpoint"
-SUBDIR+= mkubootimage
-.endif
-
-.if ${MACHINE} == "evbarm" || ${MACHINE} == "evbmips" || \
-${MACHINE} == "evbppc" || ${MACHINE} == "evbsh3" || \
${MACHINE} == "sandpoint" || \
${MACHINE_CPU} == "riscv"
+SUBDIR+= mkubootimage
SUBDIR+= libfdt .WAIT
SUBDIR+= dtc
.endif
CVS commit: src/tools
Module Name:src Committed By: gutteridge Date: Thu May 23 02:50:47 UTC 2024 Modified Files: src/tools: Makefile Log Message: Add mkubootimage to riscv tools To generate a diff of this commit: cvs rdiff -u -r1.219 -r1.220 src/tools/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/distrib/emips/ramdisk
Module Name:src Committed By: tsutsui Date: Wed May 22 16:24:41 UTC 2024 Modified Files: src/distrib/emips/ramdisk: list Log Message: Also remove installboot(8) from emips install ramdisk. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/emips/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/emips/ramdisk/list diff -u src/distrib/emips/ramdisk/list:1.4 src/distrib/emips/ramdisk/list:1.5 --- src/distrib/emips/ramdisk/list:1.4 Sun Jun 19 02:40:38 2011 +++ src/distrib/emips/ramdisk/list Wed May 22 16:24:40 2024 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.4 2011/06/19 02:40:38 tsutsui Exp $ +# $NetBSD: list,v 1.5 2024/05/22 16:24:40 tsutsui Exp $ SRCDIRS bin sbin usr.bin usr.sbin sys/arch/emips/stand @@ -47,8 +47,6 @@ PROG usr/bin/sed PROG usr/bin/tip PROG usr/bin/tset -PROG usr/sbin/installboot - PROG usr/sbin/chown usr/bin/chgrp PROG usr/sbin/chroot
CVS commit: src/distrib/emips/ramdisk
Module Name:src Committed By: tsutsui Date: Wed May 22 16:24:41 UTC 2024 Modified Files: src/distrib/emips/ramdisk: list Log Message: Also remove installboot(8) from emips install ramdisk. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/emips/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src
Committed By: riastradh
Date: Wed May 22 15:59:25 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/linux: linux_xa.c
Log Message:
linux_xa: Delete and replace collision in xa_store as intended.
Don't free the colliding node that's still in the tree.
Noted by rjs@.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/linux/linux_xa.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/external/bsd/drm2/linux/linux_xa.c
diff -u src/sys/external/bsd/drm2/linux/linux_xa.c:1.3 src/sys/external/bsd/drm2/linux/linux_xa.c:1.4
--- src/sys/external/bsd/drm2/linux/linux_xa.c:1.3 Sun Dec 19 12:05:25 2021
+++ src/sys/external/bsd/drm2/linux/linux_xa.c Wed May 22 15:59:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_xa.c,v 1.3 2021/12/19 12:05:25 riastradh Exp $ */
+/* $NetBSD: linux_xa.c,v 1.4 2024/05/22 15:59:25 riastradh Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_xa.c,v 1.3 2021/12/19 12:05:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_xa.c,v 1.4 2024/05/22 15:59:25 riastradh Exp $");
/*
* This is a lame-o implementation of the Linux xarray data type, which
@@ -124,7 +124,7 @@ xa_load(struct xarray *xa, unsigned long
void *
xa_store(struct xarray *xa, unsigned long key, void *datum, gfp_t gfp)
{
- struct node *n, *collision;
+ struct node *n, *collision, *recollision;
KASSERT(datum != NULL);
KASSERT(((uintptr_t)datum & 0x3) == 0);
@@ -137,6 +137,11 @@ xa_store(struct xarray *xa, unsigned lon
mutex_enter(>xa_lock);
collision = rb_tree_insert_node(>xa_tree, n);
+ if (collision != n) {
+ rb_tree_remove_node(>xa_tree, n);
+ recollision = rb_tree_insert_node(>xa_tree, n);
+ KASSERT(recollision == n);
+ }
mutex_exit(>xa_lock);
if (collision != n) {
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src Committed By: riastradh Date: Wed May 22 15:59:25 UTC 2024 Modified Files: src/sys/external/bsd/drm2/linux: linux_xa.c Log Message: linux_xa: Delete and replace collision in xa_store as intended. Don't free the colliding node that's still in the tree. Noted by rjs@. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/linux/linux_xa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Wed May 22 15:59:12 UTC 2024 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_gem.c Log Message: drm_gem.c: Enable drm_gem_fence_array_add now that we emulate xa. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/dist/drm/drm_gem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Wed May 22 15:59:12 UTC 2024 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_gem.c Log Message: drm_gem.c: Enable drm_gem_fence_array_add now that we emulate xa. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/dist/drm/drm_gem.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/external/bsd/drm2/dist/drm/drm_gem.c diff -u src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.24 src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.25 --- src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.24 Wed May 22 15:47:18 2024 +++ src/sys/external/bsd/drm2/dist/drm/drm_gem.c Wed May 22 15:59:12 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_gem.c,v 1.24 2024/05/22 15:47:18 riastradh Exp $ */ +/* $NetBSD: drm_gem.c,v 1.25 2024/05/22 15:59:12 riastradh Exp $ */ /* * Copyright © 2008 Intel Corporation @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.24 2024/05/22 15:47:18 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.25 2024/05/22 15:59:12 riastradh Exp $"); #include #include @@ -1477,8 +1477,6 @@ drm_gem_unlock_reservations(struct drm_g } EXPORT_SYMBOL(drm_gem_unlock_reservations); -#ifndef __NetBSD__ /* XXX xarray */ - /** * drm_gem_fence_array_add - Adds the fence to an array of fences to be * waited on, deduplicating fences from the same context. @@ -1571,5 +1569,3 @@ int drm_gem_fence_array_add_implicit(str return ret; } EXPORT_SYMBOL(drm_gem_fence_array_add_implicit); - -#endif
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Wed May 22 15:47:18 UTC 2024 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_gem.c Log Message: drm_gem.c: Fix sense of assertion. This is the opposite of WARN_ON. Noted by rjs@. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/drm2/dist/drm/drm_gem.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/external/bsd/drm2/dist/drm/drm_gem.c diff -u src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.23 src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.24 --- src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.23 Sun Dec 19 11:58:49 2021 +++ src/sys/external/bsd/drm2/dist/drm/drm_gem.c Wed May 22 15:47:18 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_gem.c,v 1.23 2021/12/19 11:58:49 riastradh Exp $ */ +/* $NetBSD: drm_gem.c,v 1.24 2024/05/22 15:47:18 riastradh Exp $ */ /* * Copyright © 2008 Intel Corporation @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.23 2021/12/19 11:58:49 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.24 2024/05/22 15:47:18 riastradh Exp $"); #include #include @@ -605,7 +605,7 @@ drm_gem_get_pages(struct drm_gem_object unsigned i, npages; int ret; - KASSERT((obj->size & (PAGE_SIZE - 1)) != 0); + KASSERT((obj->size & (PAGE_SIZE - 1)) == 0); npages = obj->size >> PAGE_SHIFT; pages = kvmalloc_array(npages, sizeof(*pages), GFP_KERNEL);
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Wed May 22 15:47:18 UTC 2024 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_gem.c Log Message: drm_gem.c: Fix sense of assertion. This is the opposite of WARN_ON. Noted by rjs@. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/drm2/dist/drm/drm_gem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/installboot
Module Name:src Committed By: tsutsui Date: Wed May 22 15:42:42 UTC 2024 Modified Files: src/usr.sbin/installboot: Makefile installboot.h machines.c Removed Files: src/usr.sbin/installboot/arch: emips.c Log Message: Remove no-op emips stuff. It seems blindly copied and modified from pmax, but emips bootloader can be specified by "Ml40x_2ace.plx" config file on the Giano simulator. (not sure what on the real Xilinx ML401 board, but maybe hardcoded) To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/installboot/Makefile cvs rdiff -u -r1.45 -r1.46 src/usr.sbin/installboot/installboot.h cvs rdiff -u -r1.43 -r1.44 src/usr.sbin/installboot/machines.c cvs rdiff -u -r1.2 -r0 src/usr.sbin/installboot/arch/emips.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/installboot
Module Name:src
Committed By: tsutsui
Date: Wed May 22 15:42:42 UTC 2024
Modified Files:
src/usr.sbin/installboot: Makefile installboot.h machines.c
Removed Files:
src/usr.sbin/installboot/arch: emips.c
Log Message:
Remove no-op emips stuff.
It seems blindly copied and modified from pmax, but emips bootloader
can be specified by "Ml40x_2ace.plx" config file on the Giano simulator.
(not sure what on the real Xilinx ML401 board, but maybe hardcoded)
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/installboot/Makefile
cvs rdiff -u -r1.45 -r1.46 src/usr.sbin/installboot/installboot.h
cvs rdiff -u -r1.43 -r1.44 src/usr.sbin/installboot/machines.c
cvs rdiff -u -r1.2 -r0 src/usr.sbin/installboot/arch/emips.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/installboot/Makefile
diff -u src/usr.sbin/installboot/Makefile:1.59 src/usr.sbin/installboot/Makefile:1.60
--- src/usr.sbin/installboot/Makefile:1.59 Sun May 19 15:48:57 2024
+++ src/usr.sbin/installboot/Makefile Wed May 22 15:42:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2024/05/19 15:48:57 tsutsui Exp $
+# $NetBSD: Makefile,v 1.60 2024/05/22 15:42:42 tsutsui Exp $
#
.include
@@ -12,7 +12,7 @@ ARCH_XLAT+= sun2-sun68k.c sun3-sun68k.c
.if !defined(SMALLPROG) && !defined(ARCH_FILES)
ARCH_FILES= alpha.c amiga.c
-ARCH_FILES+= emips.c evbarm.c evbmips.c ews4800mips.c
+ARCH_FILES+= evbarm.c evbmips.c ews4800mips.c
ARCH_FILES+= hp300.c hppa.c
ARCH_FILES+= i386.c
ARCH_FILES+= landisk.c
Index: src/usr.sbin/installboot/installboot.h
diff -u src/usr.sbin/installboot/installboot.h:1.45 src/usr.sbin/installboot/installboot.h:1.46
--- src/usr.sbin/installboot/installboot.h:1.45 Sun May 19 15:48:57 2024
+++ src/usr.sbin/installboot/installboot.h Wed May 22 15:42:42 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: installboot.h,v 1.45 2024/05/19 15:48:57 tsutsui Exp $ */
+/* $NetBSD: installboot.h,v 1.46 2024/05/22 15:42:42 tsutsui Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -193,7 +193,6 @@ int raw_findstage2(ib_params *, uint32_
extern struct ib_mach ib_mach_alpha;
extern struct ib_mach ib_mach_amd64;
extern struct ib_mach ib_mach_amiga;
-extern struct ib_mach ib_mach_emips;
extern struct ib_mach ib_mach_evbarm;
extern struct ib_mach ib_mach_evbmips;
extern struct ib_mach ib_mach_ews4800mips;
Index: src/usr.sbin/installboot/machines.c
diff -u src/usr.sbin/installboot/machines.c:1.43 src/usr.sbin/installboot/machines.c:1.44
--- src/usr.sbin/installboot/machines.c:1.43 Sun Jun 21 17:17:02 2020
+++ src/usr.sbin/installboot/machines.c Wed May 22 15:42:42 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: machines.c,v 1.43 2020/06/21 17:17:02 thorpej Exp $ */
+/* $NetBSD: machines.c,v 1.44 2024/05/22 15:42:42 tsutsui Exp $ */
/*-
* Copyright (c) 2002-2005 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
#if !defined(__lint)
-__RCSID("$NetBSD: machines.c,v 1.43 2020/06/21 17:17:02 thorpej Exp $");
+__RCSID("$NetBSD: machines.c,v 1.44 2024/05/22 15:42:42 tsutsui Exp $");
#endif /* !__lint */
#include
@@ -48,7 +48,6 @@ struct ib_mach * const machines[] = {
_mach_alpha,
_mach_amd64,
_mach_amiga,
-_mach_emips,
_mach_evbarm,
_mach_evbmips,
_mach_ews4800mips,
