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/uts/common/sys/kmem.h | |
| 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/uts/common/sys/kmem.h')
| -rw-r--r-- | usr/src/uts/common/sys/kmem.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/uts/common/sys/kmem.h b/usr/src/uts/common/sys/kmem.h index aac2eafa3c..bfc301a521 100644 --- a/usr/src/uts/common/sys/kmem.h +++ b/usr/src/uts/common/sys/kmem.h @@ -23,7 +23,7 @@ * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. * Copyright 2013 Nexenta Systems, Inc. All rights reserved. - * Copyright 2018, Joyent, Inc. + * Copyright 2022 Joyent, Inc. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -49,6 +49,7 @@ extern "C" { #define KM_PANIC 0x0002 /* if memory cannot be allocated, panic */ #define KM_PUSHPAGE 0x0004 /* can block for memory; may use reserve */ #define KM_NORMALPRI 0x0008 /* with KM_NOSLEEP, lower priority allocation */ +#define KM_NOSLEEP_LAZY (KM_NOSLEEP | KM_NORMALPRI) /* Syntactic sugar. */ #define KM_VMFLAGS 0x00ff /* flags that must match VM_* flags */ #define KM_FLAGS 0xffff /* all settable kmem flags */ |