Module Name: src
Committed By: christos
Date: Wed Dec 6 19:15:27 UTC 2017
Modified Files:
src/sys/compat/netbsd32: netbsd32_netbsd.c netbsd32_signal.c
Log Message:
disable 32 bit signal ktrace records; 32 bit traced process produce 64 bit
trace records, the only record that we can't parse is that one :-)
XXX: pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.43 -r1.44 src/sys/compat/netbsd32/netbsd32_signal.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.207 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.208
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.207 Mon Jul 31 11:38:01 2017
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Wed Dec 6 14:15:27 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.207 2017/07/31 15:38:01 maxv Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.208 2017/12/06 19:15:27 christos Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.207 2017/07/31 15:38:01 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.208 2017/12/06 19:15:27 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -159,7 +159,11 @@ struct emul emul_netbsd32 = {
.e_usertrap = NULL,
.e_ucsize = sizeof(ucontext32_t),
.e_startlwp = startlwp32,
- .e_ktrpsig = netbsd32_ktrpsig
+#ifdef notyet
+ .e_ktrpsig = netbsd32_ktrpsig,
+#else
+ .e_ktrpsig = NULL,
+#endif
};
/*
Index: src/sys/compat/netbsd32/netbsd32_signal.c
diff -u src/sys/compat/netbsd32/netbsd32_signal.c:1.43 src/sys/compat/netbsd32/netbsd32_signal.c:1.44
--- src/sys/compat/netbsd32/netbsd32_signal.c:1.43 Sun Sep 18 01:16:21 2016
+++ src/sys/compat/netbsd32/netbsd32_signal.c Wed Dec 6 14:15:27 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_signal.c,v 1.43 2016/09/18 05:16:21 christos Exp $ */
+/* $NetBSD: netbsd32_signal.c,v 1.44 2017/12/06 19:15:27 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.43 2016/09/18 05:16:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.44 2017/12/06 19:15:27 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -226,6 +226,7 @@ netbsd32_ksi32_to_ksi(struct _ksiginfo *
}
}
+#ifdef notyet
#ifdef KTRACE
static void
netbsd32_ksi_to_ksi32(struct __ksiginfo32 *si32, const struct _ksiginfo *si)
@@ -268,6 +269,7 @@ netbsd32_ksi_to_ksi32(struct __ksiginfo3
}
}
#endif
+#endif
void
netbsd32_si_to_si32(siginfo32_t *si32, const siginfo_t *si)
@@ -513,6 +515,7 @@ struct netbsd32_ktr_psig {
/* and optional siginfo_t */
};
+#ifdef notyet
#ifdef KTRACE
void
netbsd32_ktrpsig(int sig, sig_t action, const sigset_t *mask,
@@ -548,5 +551,4 @@ netbsd32_ktrpsig(int sig, sig_t action,
ktraddentry(l, kte, KTA_WAITOK);
}
#endif
-
-
+#endif
