Module Name: src
Committed By: maxv
Date: Tue May 5 06:32:43 UTC 2020
Modified Files:
src/sys/arch/amd64/amd64: locore.S
Log Message:
Fix KASAN, init_xen_early must be called after kasan_early_init.
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/sys/arch/amd64/amd64/locore.S
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/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.207 src/sys/arch/amd64/amd64/locore.S:1.208
--- src/sys/arch/amd64/amd64/locore.S:1.207 Sat May 2 19:01:08 2020
+++ src/sys/arch/amd64/amd64/locore.S Tue May 5 06:32:43 2020
@@ -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 @@ longmode_hi:
#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)
