diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-03-13 00:14:39 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-03-13 00:14:39 +0000 |
| commit | c36c15a6ac30c2c450f6854e51dd494932b163d6 (patch) | |
| tree | 7174ca31eb751291428f145fbb734c0e465c33df /sys/arch | |
| parent | 364e1bbecc98f7653ed15189eab3bd75e7ddcaee (diff) | |
Add speciulation barrier after the last remaining naked ERET instruction.
While the barrier isn't really needed here, it doesn't hurt and having
it there establishes a pattern for people to follow.
idiomatic deraadt@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arm64/arm64/locore.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/arm64/arm64/locore.S b/sys/arch/arm64/arm64/locore.S index e4c6c335e53..6de148c1f5e 100644 --- a/sys/arch/arm64/arm64/locore.S +++ b/sys/arch/arm64/arm64/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.30 2020/03/11 13:41:53 deraadt Exp $ */ +/* $OpenBSD: locore.S,v 1.31 2020/03/13 00:14:38 kettenis Exp $ */ /*- * Copyright (c) 2012-2014 Andrew Turner * All rights reserved. @@ -109,6 +109,8 @@ drop_to_el1: isb eret + dsb nsh + isb .align 3 .Lsctlr_res1: |