summaryrefslogtreecommitdiff
path: root/usr/src/uts/intel/sys/segments.h
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-11-08 14:16:48 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-11-08 14:16:48 +0000
commit4351df24a18fd73b1e6cc2591e622883e502167c (patch)
tree055eea240497456740e6f737bef63765ed7a6574 /usr/src/uts/intel/sys/segments.h
parentfaabb223a29c66e258a2c067cb14888c51ba6f47 (diff)
parent42cd19316c818c8b8283fc48263a1b4ce99cf049 (diff)
downloadillumos-joyent-4351df24a18fd73b1e6cc2591e622883e502167c.tar.gz
[illumos-gate merge]
commit 42cd19316c818c8b8283fc48263a1b4ce99cf049 11859 need swapgs mitigation commit ad3e6d4dd82f2e18743399134a4b99cf303478f6 11880 changing encryption key on dataset with unencrypted children triggers VERIFY commit 249622b3e0d46f0016d00e3f87b314635d11065a 11929 mac_minor_hold() gets id_alloc_nosleep() wrong commit 1c085a54d061bc17f8b209d1ea6161fcdf66d971 3334 zonestat missing man page commit 327c8d1665439dd2540c1b460773bd9f0c1c0fa9 11792 ibtl: cast between incompatible function types commit 22f89f96cd7b45b9686231ed7d98e610077df6c6 11922 ipmi_open looks for wrong return value
Diffstat (limited to 'usr/src/uts/intel/sys/segments.h')
-rw-r--r--usr/src/uts/intel/sys/segments.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr/src/uts/intel/sys/segments.h b/usr/src/uts/intel/sys/segments.h
index 6bf18b3082..52831c9d87 100644
--- a/usr/src/uts/intel/sys/segments.h
+++ b/usr/src/uts/intel/sys/segments.h
@@ -2,7 +2,7 @@
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
*/
/*
- * Copyright 2018 Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
*/
#ifndef _SYS_SEGMENTS_H
@@ -179,7 +179,6 @@ extern void __set_ds(selector_t);
extern void __set_es(selector_t);
extern void __set_fs(selector_t);
extern void __set_gs(selector_t);
-extern void __swapgs(void);
#endif /* __amd64 */
#if defined(__amd64)