Date: Sun, 27 May 2018 14:22:46 -0600 From: Sean Bruno <sbruno@freebsd.org> To: junchoon@dec.sakura.ne.jp, freebsd-stable@freebsd.org Cc: supportme@ukr.net, david@catwhisker.org, imp@bsdimp.com Subject: Re: r334229 breaks build kernel Message-ID: <30d3e0ec-7443-3e5e-5a3a-9683427db579@freebsd.org> In-Reply-To: <20180527151853.a8cbb9c0f68ab678f6082e63@dec.sakura.ne.jp> References: <1527346385.620374207.gguw32a1@frv33.fwdcdn.com> <CANCZdfoqtSREj=0naveCPCFFLmYAZzFUtCoCyMdaceS5qkeCmg@mail.gmail.com> <20180527151853.a8cbb9c0f68ab678f6082e63@dec.sakura.ne.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0jvRCzBYS4cbfz3be5NKMgMO3nkXxa91D Content-Type: multipart/mixed; boundary="Q55IbqPd8lpJA0SRRxniQwHkou2D27Cdr"; protected-headers="v1" From: Sean Bruno <sbruno@freebsd.org> To: junchoon@dec.sakura.ne.jp, freebsd-stable@freebsd.org Cc: supportme@ukr.net, david@catwhisker.org, imp@bsdimp.com Message-ID: <30d3e0ec-7443-3e5e-5a3a-9683427db579@freebsd.org> Subject: Re: r334229 breaks build kernel References: <1527346385.620374207.gguw32a1@frv33.fwdcdn.com> <CANCZdfoqtSREj=0naveCPCFFLmYAZzFUtCoCyMdaceS5qkeCmg@mail.gmail.com> <20180527151853.a8cbb9c0f68ab678f6082e63@dec.sakura.ne.jp> In-Reply-To: <20180527151853.a8cbb9c0f68ab678f6082e63@dec.sakura.ne.jp> --Q55IbqPd8lpJA0SRRxniQwHkou2D27Cdr Content-Type: text/plain; charset=iso-2022-jp Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 05/27/18 00:18, Tomoaki AOKI wrote: > 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". >=20 > r334228 and before had "hz / isc->quanta - 1", so missingly removed > " - " instead of " - 1". >=20 > Any other hunks looks fine. >=20 > Regards. >=20 > On Sat, 26 May 2018 10:37:34 -0600 > Warner Losh <imp@bsdimp.com> wrote: >=20 >> Looks like sean's merge was incomplete somehow. >> >> Warner >> >> On Sat, May 26, 2018 at 9:02 AM, Dmitriy Makarov <supportme@ukr.net> w= rote: >> >>> Hi, >>> >>> probably this last changes https://svnweb.freebsd.org/ >>> base?view=3Drevision&revision=3D334229 breaks buildkernel in stable/1= 1 >>> >>> If it is related my kernel config contains IOSCHED option: >>> options CAM_IOSCHED_DYNAMIC >>> >>> >>> cc -target x86_64-unknown-freebsd11.2 --sysroot=3D/usr/obj/usr/src/tm= p >>> -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-p= ointer >>> -mno-omit-leaf-frame-pointer -MD -MF.depend.cam_iosched.o -MTcam_ios= ched.o >>> -mcmodel=3Dkernel -mno-red-zone -mno-mmx -mno-sse -msoft-float >>> -fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protec= tor >>> -gdwarf-2 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototype= s >>> -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef >>> -Wno-pointer-sign -D__printf__=3D__freebsd_kprintf__ -Wmissing-includ= e-dirs >>> -fdiagnostics-show-option -Wno-unknown-pragmas -Wno-error-tautologica= l-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=3Diso9899:1999 -W >>> error /usr/src/sys/cam/cam_iosched.c >>> >>> /usr/src/sys/cam/cam_iosched.c:513:40: error: no member named 'quanta= 1' >>> in 'struct cam_iosched_softc'; did you mean 'quanta'? >>> callout_reset(&isc->ticker, hz / isc->quanta1, cam_iosched_ti= cker, >>> 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 p= er >>> 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.o= rg" >> >=20 >=20 I'm looking at this. sean --Q55IbqPd8lpJA0SRRxniQwHkou2D27Cdr-- --0jvRCzBYS4cbfz3be5NKMgMO3nkXxa91D Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE6MTp+IA1BOHj9Lo0veT1/om1/LYFAlsLE5dfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEU4 QzRFOUY4ODAzNTA0RTFFM0Y0QkEzNEJERTRGNUZFODlCNUZDQjYACgkQveT1/om1 /LZiAwf+JWqmrkGIBBnBrPWOu8E40bV2nnbz65Pu7QZF37ejuXV2Z4kpYyqex6qF g0vM2g/nTe1G87XuBK/hTwAAF2ORm1mynCN2ygq/+ycrgHjZMeh1/apk0Rwec9/R RgRXy4egM4TGmOv3iSCa9tEOQpMpr9OeC7G0pOc80P7qz9+4kEZ9pziENfw7bNUF WdBsJweDsceWmlfnsekAbzy8YW8F81lZb2K1Yqw5o/i3rNd7bzsMagb3BHkEM9ys aluJjr0sD918OVKF710zwhjM4Xf+q19/BAzu7BPNDKyGjTHFhxkvU84MrYKMorzU RQGbTQl06OHNLLt3UKv4z6YqjRntiw== =SW7l -----END PGP SIGNATURE----- --0jvRCzBYS4cbfz3be5NKMgMO3nkXxa91D--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?30d3e0ec-7443-3e5e-5a3a-9683427db579>