From owner-freebsd-current@FreeBSD.ORG Sat Nov 22 15:01:19 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A50483A5 for ; Sat, 22 Nov 2014 15:01:19 +0000 (UTC) Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com [74.125.82.48]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3507BB8C for ; Sat, 22 Nov 2014 15:01:18 +0000 (UTC) Received: by mail-wg0-f48.google.com with SMTP id y19so8871190wgg.7 for ; Sat, 22 Nov 2014 07:01:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:message-id:date:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=6+sT4S9Rt4T7vOcldcRos+hifB1PzJWiRZ4pTqWuuek=; b=AiU6bxPXPFSuD1O/8XzZUHOW4bX5r+zqoQTdiH16xLRNS7wMM/VUrsomUjMOCcJ36g 69plAXkBBrHARaHE/WT0Rc1xsH4KcDMA5hxUSZ7luUexWFHKuoHm3oUHQSt2GfsXvVA5 cKdHuIDeA1NXZuJv8M0F+nxXTKK3wljcfUO/UHsh37VS/2RezLC4XGbiKaiSOK0368+m mGlhu3AXGQyHg9OjG2taYqdb1kr9ImD4EPT8/amiIFmgrGFvvlKLdT9nqiAm5ULfCyuh ymCCw4yPC8rSpWfZ1sR4lPVOmXJlIhm5Bxn4i7199Gi+z2bSvzRfyI0fSqWqu2DuNKxj fDeA== X-Gm-Message-State: ALoCoQn1rHhj/AGud6kIjov8bc1QwwMe4M67fBVWmKqya7efJzUEKn/vAQrBlbKNMDgceCkkzOKU X-Received: by 10.180.93.132 with SMTP id cu4mr6325874wib.46.1416668476467; Sat, 22 Nov 2014 07:01:16 -0800 (PST) Received: from [10.10.1.68] (82-69-141-170.dsl.in-addr.zen.co.uk. [82.69.141.170]) by mx.google.com with ESMTPSA id r10sm3560362wiy.19.2014.11.22.07.01.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Nov 2014 07:01:15 -0800 (PST) From: Steven Hartland X-Google-Original-From: Steven Hartland Message-ID: <5470A53A.4010008@freebsd.org> Date: Sat, 22 Nov 2014 15:01:14 +0000 User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: David Wolfskill , current@freebsd.org Subject: Re: Problem with r274819? asr_timeout() not found References: <20141122143456.GU31571@albert.catwhisker.org> In-Reply-To: <20141122143456.GU31571@albert.catwhisker.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Mailman-Approved-At: Sat, 22 Nov 2014 17:03:48 +0000 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 15:01:19 -0000 Fixed, sorry forgot asr wasn't in GENERIC, so missed it in testing. On 22/11/2014 14:34, David Wolfskill wrote: > Running: > FreeBSD g1-253.catwhisker.org 11.0-CURRENT FreeBSD 11.0-CURRENT #1434 r274790M/274790:1100047: Fri Nov 21 06:07:24 PST 2014 root@g1-253.catwhisker.org:/common/S4/obj/usr/src/sys/CANARY i386 > > > Updated sources to r274845; "make buildworld" is OK, but "make buildkernel": > > ... >>>> stage 3.2: building everything > ... > ===> asr (all) > --- asr.o --- > --- all_subdir_asmc --- > ctfconvert -L VERSION -g asmc.o > --- all_subdir_asr --- > clang -O2 -pipe -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc -DHAVE_KERNEL_OPTION_HEADERS -include /common/S4/obj/usr/src/sys/GENERIC/opt_global.h -I. -I/usr/src/sys -I/usr/src/sys/contrib/altq -fno-common -g -I/common/S4/obj/usr/src/sys/GENERIC -mno-mmx -mno-sse -msoft-float -ffreestanding -fstack-protector -gdwarf-2 -mno-aes -mno-avx -Qunused-arguments -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -Wmissing-include-dirs -fdiagnostics-show-option -Wno-error-tautological-compare -Wno-error-empty-body -Wno-error-parentheses-equality -Wno-error-unused-function -Wno-array-bounds -mno-aes -mno-avx -Qunused-arguments -c /usr/src/sys/modules/asr/../../dev/asr/asr.c > --- all_subdir_asmc --- > --- asmc.kld --- > ld -d -warn-common -r -d -o asmc.kld asmc.o > ctfmerge -L VERSION -g -o asmc.kld asmc.o > :> export_syms > awk -f /usr/src/sys/conf/kmod_syms.awk asmc.kld export_syms | xargs -J% objcopy % asmc.kld > --- asmc.ko.debug --- > ld -Bshareable -d -warn-common -o asmc.ko.debug asmc.kld > --- asmc.ko.symbols --- > objcopy --only-keep-debug asmc.ko.debug asmc.ko.symbols > --- all_subdir_asr --- > /usr/src/sys/modules/asr/../../dev/asr/asr.c:393:15: error: use of undeclared identifier 'asr_timeout' > ch = timeout(asr_timeout, (caddr_t)ccb, > ^ > 1 error generated. > --- all_subdir_asmc --- > --- asmc.ko --- > --- all_subdir_asr --- > *** [asr.o] Error code 1 > > bmake: stopped in /usr/src/sys/modules/asr > 1 error > > bmake: stopped in /usr/src/sys/modules/asr > --- all_subdir_asmc --- > objcopy --strip-debug --add-gnu-debuglink=asmc.ko.symbols asmc.ko.debug asmc.ko > --- all_subdir_asr --- > *** [all_subdir_asr] Error code 2 > > bmake: stopped in /usr/src/sys/modules > --- all_subdir_asmc --- > A failure has been detected in another branch of the parallel make > > bmake: stopped in /usr/src/sys/modules/asmc > *** [all_subdir_asmc] Error code 2 > > bmake: stopped in /usr/src/sys/modules > --- all_subdir_arcmsr --- > ctfconvert -L VERSION -g arcmsr.o > A failure has been detected in another branch of the parallel make > > bmake: stopped in /usr/src/sys/modules/arcmsr > *** [all_subdir_arcmsr] Error code 2 > > bmake: stopped in /usr/src/sys/modules > --- all_subdir_aic7xxx --- > --- aic79xx.o --- > ctfconvert -L VERSION -g aic79xx.o > A failure has been detected in another branch of the parallel make > > bmake: stopped in /usr/src/sys/modules/aic7xxx/ahd > *** [_sub.all] Error code 2 > > bmake: stopped in /usr/src/sys/modules/aic7xxx > 1 error > > bmake: stopped in /usr/src/sys/modules/aic7xxx > *** [all_subdir_aic7xxx] Error code 2 > > bmake: stopped in /usr/src/sys/modules > 4 errors > > bmake: stopped in /usr/src/sys/modules > *** [modules-all] Error code 2 > > bmake: stopped in /common/S4/obj/usr/src/sys/GENERIC > 1 error > > bmake: stopped in /common/S4/obj/usr/src/sys/GENERIC > *** [buildkernel] Error code 2 > > bmake: stopped in /usr/src > 1 error > > bmake: stopped in /usr/src > *** [buildkernel] Error code 2 > > make: stopped in /usr/src > 1 error > > make: stopped in /usr/src > freebeast(11.0-C)[3] > > > And r274819 did: > > Index: asr.c > =================================================================== > --- asr.c (revision 274818) > +++ asr.c (revision 274819) > @@ -386,8 +386,12 @@ > STAILQ_HEAD_INITIALIZER(Asr_softc_list); > > static __inline void > -set_ccb_timeout_ch(union asr_ccb *ccb, struct callout_handle ch) > +set_ccb_timeout_ch(union asr_ccb *ccb) > { > + struct callout_handle ch; > + > + ch = timeout(asr_timeout, (caddr_t)ccb, > + (int)((u_int64_t)(ccb->ccb_h.timeout) * (u_int32_t)hz / 1000)); > ccb->ccb_h.sim_priv.entries[0].ptr = ch.callout; > } > > @@ -812,8 +816,7 @@ > */ > ccb->ccb_h.timeout = 6 * 60 * 1000; > } > - set_ccb_timeout_ch(ccb, timeout(asr_timeout, (caddr_t)ccb, > - (ccb->ccb_h.timeout * hz) / 1000)); > + set_ccb_timeout_ch(ccb); > } > splx(s); > } /* ASR_ccbAdd */ > @@ -1337,9 +1340,7 @@ > cam_sim_unit(xpt_path_sim(ccb->ccb_h.path)), s); > if (ASR_reset (sc) == ENXIO) { > /* Try again later */ > - set_ccb_timeout_ch(ccb, timeout(asr_timeout, > - (caddr_t)ccb, > - (ccb->ccb_h.timeout * hz) / 1000)); > + set_ccb_timeout_ch(ccb); > } > return; > } > @@ -1353,9 +1354,7 @@ > if ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_CMD_TIMEOUT) { > debug_asr_printf (" AGAIN\nreinitializing adapter\n"); > if (ASR_reset (sc) == ENXIO) { > - set_ccb_timeout_ch(ccb, timeout(asr_timeout, > - (caddr_t)ccb, > - (ccb->ccb_h.timeout * hz) / 1000)); > + set_ccb_timeout_ch(ccb); > } > splx(s); > return; > @@ -1364,8 +1363,7 @@ > /* If the BUS reset does not take, then an adapter reset is next! */ > ccb->ccb_h.status &= ~CAM_STATUS_MASK; > ccb->ccb_h.status |= CAM_CMD_TIMEOUT; > - set_ccb_timeout_ch(ccb, timeout(asr_timeout, (caddr_t)ccb, > - (ccb->ccb_h.timeout * hz) / 1000)); > + set_ccb_timeout_ch(ccb); > ASR_resetBus (sc, cam_sim_bus(xpt_path_sim(ccb->ccb_h.path))); > xpt_async (AC_BUS_RESET, ccb->ccb_h.path, NULL); > splx(s); > > Maybe something was omitted from the commit? > > Peace, > david