svn commit: r290857 - head/sys/kern

[Ivan Klymenko]

On Sun, 15 Nov 2015 12:10:52 +0000 (UTC)
Edward Tomasz Napierala <trasz at FreeBSD.org> wrote:

> Author: trasz
> Date: Sun Nov 15 12:10:51 2015
> New Revision: 290857
> URL: https://svnweb.freebsd.org/changeset/base/290857
> 
> Log:
>   Speed up rctl operation with large rulesets, by holding the lock
>   during iteration instead of relocking it for each traversed rule.
>   
>   Reviewed by:	mjg@
>   MFC after:	1 month
>   Sponsored by:	The FreeBSD Foundation
>   Differential Revision:	https://reviews.freebsd.org/D4110
> 
> Modified:
>   head/sys/kern/kern_jail.c
>   head/sys/kern/kern_loginclass.c
>   head/sys/kern/kern_racct.c
>   head/sys/kern/kern_rctl.c
>   head/sys/kern/kern_resource.c
> 
> Modified: head/sys/kern/kern_jail.c

/usr/local/libexec/ccache/world/cc -target x86_64-unknown-freebsd11.0 --sysroot=/media/da0s1/obj/usr/src/tmp -B/media/da0s1/obj/usr/src/tmp/usr/bin -c -O2 -pipe -fno-strict-aliasing -march=native  -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 -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float  -fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector -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  -O3 -fvectorize -fslp-vectorize -fblocks -fcolor-diagnostics -mno-
 aes -mno-avx  -std=iso9899:1999 -Werror  /usr/src/sys/kern/kern_jail.c
/usr/src/sys/kern/kern_jail.c:4482:1: error: conflicting types for 'prison_racct_foreach'
prison_racct_foreach(void (*callback)(struct racct *racct,
^
/usr/src/sys/sys/jail.h:407:6: note: previous declaration is here
void prison_racct_foreach(void (*callback)(struct racct *racct,
     ^
1 error generated.
*** Error code 1

Stop.
make[2]: stopped in /media/da0s1/obj/usr/src/sys/mk11
*** Error code 1

Stop.
make[1]: stopped in /usr/src
*** Error code 1

Stop.
make: stopped in /usr/src