Date: Wed, 27 Nov 2013 08:59:55 -0500 From: Shawn Webb <lattera@gmail.com> To: FreeBSD Tinderbox <tinderbox@freebsd.org> Cc: amd64@freebsd.org, current@freebsd.org Subject: Re: [head tinderbox] failure on amd64/amd64 Message-ID: <CADt0fhz%2B_CW6hugkQNopNmVwnoQTBYzS4Pf-f2OpM-b9RCBnOg@mail.gmail.com> In-Reply-To: <201311271307.rARD75uU053242@freebsd-current.sentex.ca> References: <201311271307.rARD75uU053242@freebsd-current.sentex.ca>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Nov 27, 2013 at 8:07 AM, FreeBSD Tinderbox <tinderbox@freebsd.org>wrote:
>
> >>> stage 3.2: building everything
> [...]
> ^
> /src/sys/sys/sdt.h:153:19: note: expanded from macro 'SDT_PROBE_DEFINE'
> struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1] = {
> \
> ^
> <scratch space>:51:1: note: expanded from here
> sdt_vnet_functions_vnet_destroy_entry
> ^
> 4 errors generated.
> *** Error code 1
>
> Stop.
> bmake[1]: stopped in /obj/amd64.amd64/src/sys/LINT-VIMAGE
> *** Error code 1
>
> Stop.
> bmake: stopped in /src
> *** Error code 1
>
> Stop in /src.
> TB --- 2013-11-27 13:07:05 - WARNING: /usr/bin/make returned exit code 1
> TB --- 2013-11-27 13:07:05 - ERROR: failed to build LINT-VIMAGE kernel
> TB --- 2013-11-27 13:07:05 - 15909.88 user 3061.45 system 20807.46 real
>
>
> http://tinderbox.freebsd.org/tinderbox-head-build-HEAD-amd64-amd64.full
>
Seems like this was a typo or copy/paste error. This patch fixes it:
diff --git a/sys/net/vnet.c b/sys/net/vnet.c
index 977bf59..bceb2ef 100644
--- a/sys/net/vnet.c
+++ b/sys/net/vnet.c
@@ -216,7 +216,7 @@ SDT_PROBE_DEFINE2(vnet, functions, vnet_alloc, return,
"int", "struct vnet *");
SDT_PROBE_DEFINE2(vnet, functions, vnet_destroy, entry,
"int", "struct vnet *");
-SDT_PROBE_DEFINE1(vnet, functions, vnet_destroy, entry,
+SDT_PROBE_DEFINE1(vnet, functions, vnet_destroy, return,
"int");
#ifdef DDB
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADt0fhz%2B_CW6hugkQNopNmVwnoQTBYzS4Pf-f2OpM-b9RCBnOg>