From 05385d047e961a79f9cbb14c45b56825e199c945 Mon Sep 17 00:00:00 2001 From: John Levon Date: Thu, 2 Apr 2020 23:01:31 +0000 Subject: 12349 clean up 32-bit assembly and lint [fix mismerge] --- usr/src/uts/intel/ia32/ml/copy.s | 24 ------------------------ 1 file changed, 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 -- cgit v1.2.3