Source-Changes-HG archive

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

[src/trunk]: src/sys/sys Temporarily disable the dummy inline funcs, and repl...



details:   https://anonhg.NetBSD.org/src/rev/f12b6ef3f538
branches:  trunk
changeset: 992278:f12b6ef3f538
user:      kre <kre%NetBSD.org@localhost>
date:      Wed Aug 22 12:14:29 2018 +0000

description:
Temporarily disable the dummy inline funcs, and replace them with
__nothing until maxv sorts out the type issues - kern_malloc()
(for historical reasons) takes an unsigned long parameter, not a
size_t - on 64 bit arch's this makes no difference (size_t is unsigned
long) but that's not true on 32 bit archs (or not all of them anyway).

This should unbreak the i386 build (others?) - hopefully without
damaging anything too badly.    Note the type issues need fixing,
just making this change permanent is not the solution.

diffstat:

 sys/sys/asan.h |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (30 lines):

diff -r af109d7451f5 -r f12b6ef3f538 sys/sys/asan.h
--- a/sys/sys/asan.h    Wed Aug 22 12:07:42 2018 +0000
+++ b/sys/sys/asan.h    Wed Aug 22 12:14:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asan.h,v 1.4 2018/08/22 11:55:28 martin Exp $  */
+/*     $NetBSD: asan.h,v 1.5 2018/08/22 12:14:29 kre Exp $     */
 
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -39,6 +39,8 @@
 void kasan_alloc(const void *, size_t, size_t);
 void kasan_free(const void *, size_t);
 #else
+#if 0
+/* there are type issues - kmem_alloc() takes a u_long size not size_t */
 static void __inline __unused
 kasan_add_redzone(size_t *size __unused)
 {
@@ -57,6 +59,11 @@
 {
        /* nothing */
 }
+#else
+#define        kasan_add_redzone(SP)   __nothing
+#define        kasan_alloc(P, S1, S2)  __nothing
+#define        kasan_free(P, S)        __nothing
+#endif
 #endif
 
 #endif /* !_SYS_ASAN_H_ */



Home | Main Index | Thread Index | Old Index