[src/netbsd-9]: src Pull up following revision(s) (requested by jmcneill in t...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2efecf62f589
branches:  netbsd-9
changeset: 465992:2efecf62f589
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Dec 08 15:54:34 2019 +0000

description:
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

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/arc.c |  3 +++
 external/cddl/osnet/dist/uts/common/os/fm.c      |  1 +
 share/mk/bsd.own.mk                              |  6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r 6b835549b882 -r 2efecf62f589 external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c  Sun Dec 08 15:05:44 2019 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c  Sun Dec 08 15:54:34 2019 +0000
@@ -280,6 +280,9 @@
 #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
diff -r 6b835549b882 -r 2efecf62f589 external/cddl/osnet/dist/uts/common/os/fm.c
--- a/external/cddl/osnet/dist/uts/common/os/fm.c       Sun Dec 08 15:05:44 2019 +0000
+++ b/external/cddl/osnet/dist/uts/common/os/fm.c       Sun Dec 08 15:54:34 2019 +0000
@@ -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>
diff -r 6b835549b882 -r 2efecf62f589 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sun Dec 08 15:05:44 2019 +0000
+++ b/share/mk/bsd.own.mk       Sun Dec 08 15:54:34 2019 +0000
@@ -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 @@
 .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