diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-04-21 11:46:07 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-04-21 11:46:07 -0400 |
| commit | 043819558530b9580af0efc07bc0af452bcfcef5 (patch) | |
| tree | cef3a0fe4c57c2904841c5e7d02616294c6c1e6a /usr/src/uts/common | |
| parent | 7e5cd87005240f2e0f5ae527ae003c420a0c10f3 (diff) | |
| parent | f5ac85908213ce2217329b835bf3c91f1c04b793 (diff) | |
| download | illumos-joyent-release-20210422.tar.gz | |
[illumos-gate merge]release-20210422
commit f5ac85908213ce2217329b835bf3c91f1c04b793
13727 rust demangler loops when characters trail terminating E
commit 64b8fdd9a26cb9749e154c721f0688932b5e0094
13178 ::msgbuf could see more than 8KB of logs
Diffstat (limited to 'usr/src/uts/common')
| -rw-r--r-- | usr/src/uts/common/os/logsubr.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/log.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/usr/src/uts/common/os/logsubr.c b/usr/src/uts/common/os/logsubr.c index b0a442065c..5ae6821917 100644 --- a/usr/src/uts/common/os/logsubr.c +++ b/usr/src/uts/common/os/logsubr.c @@ -217,7 +217,7 @@ log_init(void) log_intrq = log_makeq(0, LOG_HIWAT, (void *)ipltospl(SPL8)); /* - * Create a queue to hold the most recent 8K of console messages. + * Create a queue to hold the most recent 64K of console messages. * Useful for debugging. Required by the "$<msgbuf" adb macro. */ log_recentq = log_makeq(0, LOG_RECENTSIZE, NULL); diff --git a/usr/src/uts/common/sys/log.h b/usr/src/uts/common/sys/log.h index 2d1fb46b73..934b4111fd 100644 --- a/usr/src/uts/common/sys/log.h +++ b/usr/src/uts/common/sys/log.h @@ -30,8 +30,6 @@ #ifndef _SYS_LOG_H #define _SYS_LOG_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/strlog.h> #include <sys/stream.h> @@ -55,7 +53,7 @@ extern "C" { #define LOG_HIWAT 1048576 /* threshold for tossing messages */ #define LOG_MAGIC 0xf00d4109U /* "food for log" - unsent msg magic */ -#define LOG_RECENTSIZE 8192 /* queue of most recent messages */ +#define LOG_RECENTSIZE 65536 /* queue of most recent messages */ #define LOG_MINFREE 4096 /* message cache low water mark */ #define LOG_MAXFREE 8192 /* message cache high water mark */ |