r334229 breaks build kernel

[Sean Bruno]

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".
> 
> 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 <imp at bsdimp.com> wrote:
> 
>> Looks like sean's merge was incomplete somehow.
>>
>> Warner
>>
>> On Sat, May 26, 2018 at 9:02 AM, Dmitriy Makarov <supportme at ukr.net> 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 at freebsd.org mailing list
>>> https://lists.freebsd.org/mailman/listinfo/freebsd-stable
>>> To unsubscribe, send any mail to "freebsd-stable-unsubscribe at freebsd.org"
>>>
>> _______________________________________________
>> freebsd-stable at freebsd.org mailing list
>> https://lists.freebsd.org/mailman/listinfo/freebsd-stable
>> To unsubscribe, send any mail to "freebsd-stable-unsubscribe at freebsd.org"
>>
> 
> 


I'm looking at this.

sean

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20180527/8fe3595d/attachment.sig>