summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2020-04-03 00:47:04 +0100
committerGitHub <noreply@github.com>2020-04-03 00:47:04 +0100
commit543fa15d7f7b568d733fc35ce0062b507f5257ac (patch)
tree194c62f0fbae913c0f2b276eb517d5190d93c0d2
parent080b163baec0c5a81b2717cf504cac1e0e1f143f (diff)
downloadillumos-joyent-543fa15d7f7b568d733fc35ce0062b507f5257ac.tar.gz
12349 clean up 32-bit assembly and lint [fix mismerge]
Reviewed by: Jason King <jason.king@joyent.com> Approved by: Jason King <jason.king@joyent.com>
-rw-r--r--usr/src/uts/intel/ia32/ml/copy.s24
1 files changed, 0 insertions, 24 deletions
diff --git a/usr/src/uts/intel/ia32/ml/copy.s b/usr/src/uts/intel/ia32/ml/copy.s
index d02637e5fe..8c23d794f9 100644
--- a/usr/src/uts/intel/ia32/ml/copy.s
+++ b/usr/src/uts/intel/ia32/ml/copy.s
@@ -1902,30 +1902,6 @@ _flt_/**/NAME: \
.string "copyout_noerr: argument not in kernel address space"
#endif
-/*
- * These functions are used for SMAP, supervisor mode access protection. They
- * are hotpatched to become real instructions when the system starts up which is
- * done in mlsetup() as a part of enabling the other CR4 related features.
- *
- * Generally speaking, smap_disable() is a stac instruction and smap_enable is a
- * clac instruction. It's safe to call these any number of times, and in fact,
- * out of paranoia, the kernel will likely call it at several points.
- */
-
- ENTRY(smap_disable)
- nop
- nop
- nop
- ret
- SET_SIZE(smap_disable)
-
- ENTRY(smap_enable)
- nop
- nop
- nop
- ret
- SET_SIZE(smap_enable)
-
.data
.align 4
.globl _smap_enable_patch_count