[src/trunk]: src/sys/arch/amd64/amd64 Fix KASAN, init_xen_early must be calle...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8bf5066ce0cf
branches:  trunk
changeset: 971812:8bf5066ce0cf
user:      maxv <maxv%NetBSD.org@localhost>
date:      Tue May 05 06:32:43 2020 +0000

description:
Fix KASAN, init_xen_early must be called after kasan_early_init.

diffstat:

 sys/arch/amd64/amd64/locore.S |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 372e3a3bdfe1 -r 8bf5066ce0cf sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S     Tue May 05 06:20:55 2020 +0000
+++ b/sys/arch/amd64/amd64/locore.S     Tue May 05 06:32:43 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.207 2020/05/02 19:01:08 christos Exp $    */
+/*     $NetBSD: locore.S,v 1.208 2020/05/05 06:32:43 maxv Exp $        */
 
 /*
  * Copyright-o-rama!
@@ -991,14 +991,15 @@
 #endif /* XENPV */
 
        pushq   %rdi
-#if defined(XEN) && !defined(XENPV)
-       call    _C_LABEL(init_xen_early)
-#endif
        call    _C_LABEL(init_bootspace)
 #ifdef KASAN
        movq    _C_LABEL(lwp0uarea)(%rip),%rdi
        call    _C_LABEL(kasan_early_init)
 #endif
+       /* <-- DO NOT INSERT C CALLS BEFORE THIS POINT --> */
+#if defined(XEN) && !defined(XENPV)
+       call    _C_LABEL(init_xen_early)
+#endif
        call    _C_LABEL(init_slotspace)
        popq    %rdi
        call    _C_LABEL(init_x86_64)