Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern Make this compile/work on 32-bit archs. OK'ed my maxv



details:   https://anonhg.NetBSD.org/src/rev/0594d6808383
branches:  trunk
changeset: 973512:0594d6808383
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Jul 03 08:19:20 2020 +0000

description:
Make this compile/work on 32-bit archs.  OK'ed my maxv

I thought about uintptr_t, but didn't change from Elf_Addr

diffstat:

 sys/kern/subr_asan.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 9fc710283df1 -r 0594d6808383 sys/kern/subr_asan.c
--- a/sys/kern/subr_asan.c      Fri Jul 03 08:13:23 2020 +0000
+++ b/sys/kern/subr_asan.c      Fri Jul 03 08:19:20 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_asan.c,v 1.22 2020/06/30 16:20:02 maxv Exp $      */
+/*     $NetBSD: subr_asan.c,v 1.23 2020/07/03 08:19:20 skrll Exp $     */
 
 /*
  * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.22 2020/06/30 16:20:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.23 2020/07/03 08:19:20 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -122,9 +122,9 @@
 static void
 kasan_ctors(void)
 {
-       extern uint64_t __CTOR_LIST__, __CTOR_END__;
+       extern Elf_Addr __CTOR_LIST__, __CTOR_END__;
        size_t nentries, i;
-       uint64_t *ptr;
+       Elf_Addr *ptr;
 
        nentries = ((size_t)&__CTOR_END__ - (size_t)&__CTOR_LIST__) /
            sizeof(uintptr_t);



Home | Main Index | Thread Index | Old Index