Re: Problem with r274819? asr_timeout() not found

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_at_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)
> _at__at_ -386,8 +386,12 _at__at_
>   	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;
>   }
>   
> _at__at_ -812,8 +816,7 _at__at_
>   			 */
>   			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 */
> _at__at_ -1337,9 +1340,7 _at__at_
>   		  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;
>   	}
> _at__at_ -1353,9 +1354,7 _at__at_
>   	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;
> _at__at_ -1364,8 +1363,7 _at__at_
>   	/* 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