summaryrefslogtreecommitdiffstats
path: root/sys/sys/param.h
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2017-09-11 08:48:36 +0000
committerLuiz Souza <luiz@netgate.com>2018-02-19 14:31:40 -0300
commit2589da26b930eaf9441b6bf27c0f410062adf507 (patch)
treef814d1d2fffd5b06bf6cc8ee0a35de86abc861ab /sys/sys/param.h
parente4ceef150ec3bdd258987bf82d56662293bb1ace (diff)
downloadFreeBSD-src-2589da26b930eaf9441b6bf27c0f410062adf507.zip
FreeBSD-src-2589da26b930eaf9441b6bf27c0f410062adf507.tar.gz
MFC r322762, r322799, r322832, r322833:
Make WRFSBASE and WRGSBASE instructions functional. (cherry picked from commit b1a7a7418e73251aad628dc4f9418e550a9fd3d7)
Diffstat (limited to 'sys/sys/param.h')
-rw-r--r--sys/sys/param.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 16d3d6f..da63fac 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -84,7 +84,12 @@
#define P_OSREL_SHUTDOWN_ENOTCONN 1100077
#define P_OSREL_MAP_GUARD 1200035
#define P_OSREL_MAP_GUARD_11 1101501
+<<<<<<< HEAD
#define P_OSREL_MAP_GUARD_11_1 1101001
+=======
+#define P_OSREL_WRFSBASE 1200041
+#define P_OSREL_WRFSBASE_11 1101503
+>>>>>>> b1a7a7418e7... MFC r322762, r322799, r322832, r322833:
#define P_OSREL_MAJOR(x) ((x) / 100000)
#endif
OpenPOWER on IntegriCloud