diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2022-02-22 18:00:48 -0600 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2022-02-22 18:00:48 -0600 |
| commit | 3971085411b91c5d82e278443ab68fca1946cb21 (patch) | |
| tree | 8e6d01d8aea1c3d8179a47b929ff5bfa8b42f752 /usr/src/lib/libfakekernel/common/printf.c | |
| parent | 1df45418ec3688847e142a9a2213965459ff39c7 (diff) | |
| parent | ca783257c986cddcc674ae22916a6766b98a2d36 (diff) | |
| download | illumos-joyent-3971085411b91c5d82e278443ab68fca1946cb21.tar.gz | |
Merge branch 'master' of https://github.com/illumos/illumos-gate into man/big-reorg
# Conflicts:
# usr/src/cmd/fmthard/fmthard.c
# usr/src/cmd/zoneadmd/zcons.c
# usr/src/man/man2/chmod.2
# usr/src/man/man2/close.2
# usr/src/man/man2/open.2
# usr/src/man/man3c/grantpt.3c
# usr/src/man/man3c/posix_openpt.3c
# usr/src/man/man3c/ptsname.3c
# usr/src/man/man3c/unlockpt.3c
# usr/src/man/man3utempter/utempter_add_record.3utempter
# usr/src/man/man4/Makefile
# usr/src/man/man4d/ptm.4d
# usr/src/man/man4d/pts.4d
# usr/src/man/man4d/pty.4d
# usr/src/man/man4d/zcons.4d
# usr/src/man/man4m/pckt.4m
# usr/src/man/man4m/ptem.4m
# usr/src/man/man4p/vxlan.7p
# usr/src/man/man5/Makefile
# usr/src/man/man5/bhyve_config.5
# usr/src/man/man7d/Makefile
# usr/src/man/man7p/Makefile
# usr/src/man/man8/bhyve.8
# usr/src/man/man8/dladm.8
# usr/src/man/man8/flowadm.8
# usr/src/man/man8/fmthard.8
# usr/src/man/man8/in.rlogind.8
# usr/src/man/man8/in.telnetd.8
# usr/src/man/man8/nvmeadm.8
# usr/src/man/man8/pppd.8
# usr/src/pkg/manifests/SUNWcs.man4d.inc
# usr/src/uts/common/io/zcons.c
Diffstat (limited to 'usr/src/lib/libfakekernel/common/printf.c')
| -rw-r--r-- | usr/src/lib/libfakekernel/common/printf.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/lib/libfakekernel/common/printf.c b/usr/src/lib/libfakekernel/common/printf.c index 7bee92f0ca..ad492cfe28 100644 --- a/usr/src/lib/libfakekernel/common/printf.c +++ b/usr/src/lib/libfakekernel/common/printf.c @@ -22,7 +22,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. * Copyright 2021 Tintri by DDN, Inc. All rights reserved. - * Copyright 2017 RackTop Systems. + * Copyright 2022 RackTop Systems, Inc. * Copyright (c) 2018, Joyent, Inc. */ @@ -32,10 +32,10 @@ #include <sys/systm.h> #include <sys/cmn_err.h> #include <sys/log.h> +#include <upanic.h> #include <fakekernel.h> -void abort(void) __NORETURN; void debug_enter(char *); char *volatile panicstr; @@ -133,12 +133,11 @@ vpanic(const char *fmt, va_list adx) va_copy(tmpargs, adx); fakekernel_cprintf(fmt, tmpargs, SL_FATAL, "fatal: ", "\n"); - /* Call libc`assfail() so that mdb ::status works */ (void) vsnprintf(panicbuf, sizeof (panicbuf), fmt, adx); debug_enter(panicbuf); - (void) assfail(panicbuf, "(panic)", 0); - abort(); /* avoid "noreturn" warnings */ + /* Call libc`upanic() so that mdb ::status works */ + upanic(panicbuf, sizeof (panicbuf)); } void |