Module Name: src
Committed By: maxv
Date: Sun Jun 17 15:46:39 UTC 2018
Modified Files:
src/sys/arch/i386/include: frameasm.h
Log Message:
i586 and below don't have this 3-byte nop, so use three 1-byte nops,
reported by Nathanial Sloss
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/include/frameasm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/include/frameasm.h
diff -u src/sys/arch/i386/include/frameasm.h:1.25 src/sys/arch/i386/include/frameasm.h:1.26
--- src/sys/arch/i386/include/frameasm.h:1.25 Sat Jan 27 18:48:59 2018
+++ src/sys/arch/i386/include/frameasm.h Sun Jun 17 15:46:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: frameasm.h,v 1.25 2018/01/27 18:48:59 maxv Exp $ */
+/* $NetBSD: frameasm.h,v 1.26 2018/06/17 15:46:39 maxv Exp $ */
#ifndef _I386_FRAMEASM_H_
#define _I386_FRAMEASM_H_
@@ -42,11 +42,11 @@
#define SMAP_ENABLE \
HOTPATCH(HP_NAME_CLAC, 3) ; \
- .byte 0x0F, 0x1F, 0x00
+ .byte 0x90, 0x90, 0x90
#define SMAP_DISABLE \
HOTPATCH(HP_NAME_STAC, 3) ; \
- .byte 0x0F, 0x1F, 0x00
+ .byte 0x90, 0x90, 0x90
/*
* These are used on interrupt or trap entry or exit.
