From owner-freebsd-stable@freebsd.org Sun May 27 06:50:14 2018 Return-Path: Delivered-To: freebsd-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18F7FEEA703 for ; Sun, 27 May 2018 06:50:14 +0000 (UTC) (envelope-from junchoon@dec.sakura.ne.jp) Received: from dec.sakura.ne.jp (dec.sakura.ne.jp [210.188.226.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7B2347274F; Sun, 27 May 2018 06:50:12 +0000 (UTC) (envelope-from junchoon@dec.sakura.ne.jp) Received: from fortune.joker.local (124-18-70-98.dz.commufa.jp [124.18.70.98]) (authenticated bits=0) by dec.sakura.ne.jp (8.15.2/8.15.2/[SAKURA-WEB]/20080708) with ESMTPA id w4R6Irvo088912; Sun, 27 May 2018 15:18:54 +0900 (JST) (envelope-from junchoon@dec.sakura.ne.jp) Date: Sun, 27 May 2018 15:18:53 +0900 From: Tomoaki AOKI To: freebsd-stable@freebsd.org Cc: supportme@ukr.net, david@catwhisker.org, imp@bsdimp.com, sbruno@FreeBSD.org Subject: Re: r334229 breaks build kernel Message-Id: <20180527151853.a8cbb9c0f68ab678f6082e63@dec.sakura.ne.jp> In-Reply-To: References: <1527346385.620374207.gguw32a1@frv33.fwdcdn.com> Reply-To: junchoon@dec.sakura.ne.jp Organization: Junchoon corps X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd11.1) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart=_Sun__27_May_2018_15_18_53_+0900_Jw0usjchpakyd4ri" X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 May 2018 06:50:14 -0000 This is a multi-part message in MIME format. --Multipart=_Sun__27_May_2018_15_18_53_+0900_Jw0usjchpakyd4ri Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Looks simple mis-merge. On hunk 1, original (head) r323831 has "hz / isc->quanta" at 2nd arg, while r334229 (stable/11) has "hz / isc->quanta1". r334228 and before had "hz / isc->quanta - 1", so missingly removed " - " instead of " - 1". Any other hunks looks fine. Regards. On Sat, 26 May 2018 10:37:34 -0600 Warner Losh wrote: > Looks like sean's merge was incomplete somehow. > > Warner > > On Sat, May 26, 2018 at 9:02 AM, Dmitriy Makarov wrote: > > > Hi, > > > > probably this last changes https://svnweb.freebsd.org/ > > base?view=revision&revision=334229 breaks buildkernel in stable/11 > > > > If it is related my kernel config contains IOSCHED option: > > options CAM_IOSCHED_DYNAMIC > > > > > > cc -target x86_64-unknown-freebsd11.2 --sysroot=/usr/obj/usr/src/tmp > > -B/usr/obj/usr/src/tmp/usr/bin -c -O2 -pipe -fno-strict-aliasing -g > > -nostdinc -I. -I/usr/src/sys -I/usr/src/sys/contrib/libfdt -D_KERNEL > > -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-omit-frame-pointer > > -mno-omit-leaf-frame-pointer -MD -MF.depend.cam_iosched.o -MTcam_iosched.o > > -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float > > -fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector > > -gdwarf-2 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes > > -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef > > -Wno-pointer-sign -D__printf__=__freebsd_kprintf__ -Wmissing-include-dirs > > -fdiagnostics-show-option -Wno-unknown-pragmas -Wno-error-tautological-compare > > -Wno-error-empty-body -Wno-error-parentheses-equality > > -Wno-error-unused-function -Wno-error-pointer-sign > > -Wno-error-shift-negative-value -Wno-error-address-of-packed-member > > -mno-aes -mno-avx -std=iso9899:1999 -W > > error /usr/src/sys/cam/cam_iosched.c > > > > /usr/src/sys/cam/cam_iosched.c:513:40: error: no member named 'quanta1' > > in 'struct cam_iosched_softc'; did you mean 'quanta'? > > callout_reset(&isc->ticker, hz / isc->quanta1, cam_iosched_ticker, > > isc); > > ^~~~~~~ > > quanta > > /usr/src/sys/sys/callout.h:115:28: note: expanded from macro > > 'callout_reset' > > callout_reset_on((c), (on_tick), (fn), (arg), -1) > > ^ > > /usr/src/sys/sys/callout.h:112:43: note: expanded from macro > > 'callout_reset_on' > > callout_reset_sbt_on((c), tick_sbt * (to_ticks), 0, (fn), (arg), \ > > ^ > > /usr/src/sys/cam/cam_iosched.c:267:7: note: 'quanta' declared here > > int quanta; /* Number of quanta per > > second */ > > ^ > > 1 error generated. > > _______________________________________________ > > freebsd-stable@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/freebsd-stable > > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" > > > _______________________________________________ > freebsd-stable@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" > -- 青木 知明 [Tomoaki AOKI] --Multipart=_Sun__27_May_2018_15_18_53_+0900_Jw0usjchpakyd4ri Content-Type: text/x-diff; name="FIX_r334229-mismerge-cam_iosched.c.diff" Content-Disposition: attachment; filename="FIX_r334229-mismerge-cam_iosched.c.diff" Content-Transfer-Encoding: 7bit Date: Sun May 27 03:55:00 2018 Log: Fix mis-merge on r334229. On r323831, 2nd param is "hz / isc->quanta", not "hz / isc->quanta1". Modified: stable/11/sys/cam/cam_iosched.c Modified: stable/11/sys/cam/cam_iosched.c ============================================================================== --- stable/11/sys/cam/cam_iosched.c Fri May 25 23:18:06 2018 (r334229) +++ stable/11/sys/cam/cam_iosched.c Fri May 27 03:55:00 2018 (Working Copy) @@ -510,7 +510,7 @@ cam_iosched_ticker(void *arg) struct cam_iosched_softc *isc = arg; sbintime_t now, delta; - callout_reset(&isc->ticker, hz / isc->quanta1, cam_iosched_ticker, isc); + callout_reset(&isc->ticker, hz / isc->quanta, cam_iosched_ticker, isc); now = sbinuptime(); delta = now - isc->last_time; --Multipart=_Sun__27_May_2018_15_18_53_+0900_Jw0usjchpakyd4ri--