From b6de21de0e6db7018f1a79f4e09e03275f27996f Mon Sep 17 00:00:00 2001 From: avg Date: Wed, 8 Nov 2017 08:53:44 +0000 Subject: MFC r324163: MFV r323530,r323533,r323534: 7431 ZFS Channel Programs, and followups Also MFC-ed are the following fixes: - r324164 Add several new files to the files enabled by ZFS kernel option - r324178 unbreak kernel builds on sparc64 and powerpc - r324194 fix incorrect use of getzfsvfs_impl in r324163 - r324292 really unbreak kernel builds on sparc64 and powerpc64 --- cddl/contrib/opensolaris/lib/libzpool/common/kernel.c | 1 + 1 file changed, 1 insertion(+) (limited to 'cddl/contrib/opensolaris/lib/libzpool/common/kernel.c') diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c index ab1b839..1d43c8d 100644 --- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c +++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c @@ -738,6 +738,7 @@ vpanic(const char *fmt, va_list adx) char buf[512]; (void) vsnprintf(buf, 512, fmt, adx); assfail(buf, NULL, 0); + abort(); /* necessary to make vpanic meet noreturn requirements */ } void -- cgit v1.1