Module Name: src
Committed By: martin
Date: Sun Dec 8 15:54:35 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]: arc.c
src/external/cddl/osnet/dist/uts/common/os [netbsd-9]: fm.c
src/share/mk [netbsd-9]: bsd.own.mk
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #515):
external/cddl/osnet/dist/uts/common/fs/zfs/arc.c: revision 1.15
share/mk/bsd.own.mk: revision 1.1167
external/cddl/osnet/dist/uts/common/os/fm.c: revision 1.2
Provide a default ptob() implementation
Need sys/atomic.h on NetBSD
Enable ZFS support on aarch64
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.2.1 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
cvs rdiff -u -r1.1 -r1.1.2.1 src/external/cddl/osnet/dist/uts/common/os/fm.c
cvs rdiff -u -r1.1149.2.1 -r1.1149.2.2 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.14 src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.14.2.1
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.14 Sun May 26 10:21:00 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c Sun Dec 8 15:54:34 2019
@@ -280,6 +280,9 @@ int arc_procfd;
#ifndef btop
#define btop(x) ((x) / PAGE_SIZE)
#endif
+#ifndef ptob
+#define ptob(x) ((x) * PAGE_SIZE)
+#endif
//#define needfree (uvmexp.free < uvmexp.freetarg ? uvmexp.freetarg : 0)
#define buf_init arc_buf_init
#define freemem uvmexp.free
Index: src/external/cddl/osnet/dist/uts/common/os/fm.c
diff -u src/external/cddl/osnet/dist/uts/common/os/fm.c:1.1 src/external/cddl/osnet/dist/uts/common/os/fm.c:1.1.2.1
--- src/external/cddl/osnet/dist/uts/common/os/fm.c:1.1 Mon Jun 24 08:27:20 2019
+++ src/external/cddl/osnet/dist/uts/common/os/fm.c Sun Dec 8 15:54:34 2019
@@ -65,6 +65,7 @@
#include <sys/kstat.h>
#include <sys/processor.h>
#ifdef __NetBSD__
+#include <sys/atomic.h>
#include <sys/cpu.h>
#else
#include <sys/pcpu.h>
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1149.2.1 src/share/mk/bsd.own.mk:1.1149.2.2
--- src/share/mk/bsd.own.mk:1.1149.2.1 Sun Sep 1 10:40:00 2019
+++ src/share/mk/bsd.own.mk Sun Dec 8 15:54:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1149.2.1 2019/09/01 10:40:00 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1149.2.2 2019/12/08 15:54:34 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -998,9 +998,9 @@ SOFTFLOAT_BITS= 32
.endif
#
-# We want to build zfs only for amd64 by default for now.
+# We want to build zfs only for amd64 and aarch64 by default for now.
#
-.if ${MACHINE} == "amd64"
+.if ${MACHINE} == "amd64" || ${MACHINE_ARCH} == "aarch64"
MKZFS?= yes
.endif
