diff options
| author | John Levon <john.levon@joyent.com> | 2020-04-02 23:01:31 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-04-02 23:01:31 +0000 |
| commit | 05385d047e961a79f9cbb14c45b56825e199c945 (patch) | |
| tree | 194c62f0fbae913c0f2b276eb517d5190d93c0d2 | |
| parent | 080b163baec0c5a81b2717cf504cac1e0e1f143f (diff) | |
| download | illumos-joyent-fix-smap.tar.gz | |
12349 clean up 32-bit assembly and lint [fix mismerge]fix-smap
| -rw-r--r-- | usr/src/uts/intel/ia32/ml/copy.s | 24 |
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 |