summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-10-13 13:45:58 -0300
committerRenato Botelho <renato@netgate.com>2015-10-13 13:45:58 -0300
commite52aa5f667faebee85874ec39c29fa1257dd554f (patch)
treeb08cff1a8d0fb8f667942aca5b9a8be9fb5dca03 /sys/kern
parent945ed01c4bae06169f63978e43029c04d4abd731 (diff)
parent8096b85f202b18e1be6a5dd5251a10fcdb255a78 (diff)
downloadFreeBSD-src-e52aa5f667faebee85874ec39c29fa1257dd554f.zip
FreeBSD-src-e52aa5f667faebee85874ec39c29fa1257dd554f.tar.gz
Merge branch 'stable/10' into devel
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/kern_shutdown.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index f3b3c30..55fee01 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -139,6 +139,10 @@ static int show_busybufs = 1;
SYSCTL_INT(_kern_shutdown, OID_AUTO, show_busybufs, CTLFLAG_RW,
&show_busybufs, 0, "");
+int suspend_blocked = 0;
+SYSCTL_INT(_kern, OID_AUTO, suspend_blocked, CTLFLAG_RW,
+ &suspend_blocked, 0, "Block suspend due to a pending shutdown");
+
/*
* Variable panicstr contains argument to first call to panic; used as flag
* to indicate that the kernel has already called panic.
OpenPOWER on IntegriCloud