on 22/08/2010 15:16 FreeBSD Tinderbox said the following: > [...] > cc -O2 -fno-strict-aliasing -pipe -DFREEBSD_NAMECACHE -DBUILDING_ZFS > -D_KERNEL -DKLD_MODULE -std=c99 -nostdinc > -I/src/sys/modules/zfs/../../cddl/compat/opensolaris > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/zmod > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common > -I/src/sys/modules/zfs/../.. > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/zfs > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common > -I/src/sys/modules/zfs/../../../include -DHAVE_KERNEL_OPTION_HEADERS -include > /obj/src/sys/LINT/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 > --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common > -I/obj/src/sys/LINT -mno-align-long-str > ings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 > -mno-sse3 -ffreestanding -Wall -Wredundant-decls -Wnested-externs > -Wstrict-prototypes -Wmissing-prototypes -Wpointe > r-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions > -Wno-unknown-pragmas -Wno-missing-prototypes -Wno-undef > -Wno-strict-prototypes -Wno-cast-qual -Wno-parentheses -Wno-redundant-decls > -Wno-missing-braces -Wno-uninitialized -Wno-unused -Wno-inline -Wno-switch > -Wno-pointer-arith -c > /src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/zmod/trees.c > cc -O2 -fno-strict-aliasing -pipe -DFREEBSD_NAMECACHE -DBUILDING_ZFS > -D_KERNEL -DKLD_MODULE -std=c99 -nostdinc > -I/src/sys/modules/zfs/../../cddl/compat/opensolaris > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/zmod > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common > -I/src/sys/modules/zfs/../.. > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/zfs > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common > -I/src/sys/modules/zfs/../../../include -DHAVE_KERNEL_OPTION_HEADERS -include > /obj/src/sys/LINT/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 > --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common > -I/obj/src/sys/LINT -mno-align-long-str > ings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 > -mno-sse3 -ffreestanding -Wall -Wredundant-decls -Wnested-externs > -Wstrict-prototypes -Wmissing-prototypes -Wpointe > r-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions > -Wno-unknown-pragmas -Wno-missing-prototypes -Wno-undef > -Wno-strict-prototypes -Wno-cast-qual -Wno-parentheses -Wno-redundant-decls > -Wno-missing-braces -Wno-uninitialized -Wno-unused -Wno-inline -Wno-switch > -Wno-pointer-arith -c > /src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/zmod/zmod.c > cc -O2 -fno-strict-aliasing -pipe -DFREEBSD_NAMECACHE -DBUILDING_ZFS > -D_KERNEL -DKLD_MODULE -std=c99 -nostdinc > -I/src/sys/modules/zfs/../../cddl/compat/opensolaris > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/zmod > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common > -I/src/sys/modules/zfs/../.. > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/zfs > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common > -I/src/sys/modules/zfs/../../../include -DHAVE_KERNEL_OPTION_HEADERS -include > /obj/src/sys/LINT/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 > --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common > -I/obj/src/sys/LINT -mno-align-long-str > ings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 > -mno-sse3 -ffreestanding -Wall -Wredundant-decls -Wnested-externs > -Wstrict-prototypes -Wmissing-prototypes -Wpointe > r-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions > -Wno-unknown-pragmas -Wno-missing-prototypes -Wno-undef > -Wno-strict-prototypes -Wno-cast-qual -Wno-parentheses -Wno-redundant-decls > -Wno-missing-braces -Wno-uninitialized -Wno-unused -Wno-inline -Wno-switch > -Wno-pointer-arith -c > /src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c > cc -O2 -fno-strict-aliasing -pipe -DFREEBSD_NAMECACHE -DBUILDING_ZFS > -D_KERNEL -DKLD_MODULE -std=c99 -nostdinc > -I/src/sys/modules/zfs/../../cddl/compat/opensolaris > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/zmod > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common > -I/src/sys/modules/zfs/../.. > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/zfs > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common > -I/src/sys/modules/zfs/../../../include -DHAVE_KERNEL_OPTION_HEADERS -include > /obj/src/sys/LINT/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 > --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common > -I/obj/src/sys/LINT -mno-align-long-str > ings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 > -mno-sse3 -ffreestanding -Wall -Wredundant-decls -Wnested-externs > -Wstrict-prototypes -Wmissing-prototypes -Wpointe > r-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions > -Wno-unknown-pragmas -Wno-missing-prototypes -Wno-undef > -Wno-strict-prototypes -Wno-cast-qual -Wno-parentheses -Wno-redundant-decls > -Wno-missing-braces -Wno-uninitialized -Wno-unused -Wno-inline -Wno-switch > -Wno-pointer-arith -c > /src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/zmod/zutil.c > cc -O2 -fno-strict-aliasing -pipe -DFREEBSD_NAMECACHE -DBUILDING_ZFS > -D_KERNEL -DKLD_MODULE -std=c99 -nostdinc > -I/src/sys/modules/zfs/../../cddl/compat/opensolaris > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/zmod > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common > -I/src/sys/modules/zfs/../.. > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/zfs > -I/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common > -I/src/sys/modules/zfs/../../../include -DHAVE_KERNEL_OPTION_HEADERS -include > /obj/src/sys/LINT/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 > --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common > -I/obj/src/sys/LINT -mno-align-long-str > ings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 > -mno-sse3 -ffreestanding -Wall -Wredundant-decls -Wnested-externs > -Wstrict-prototypes -Wmissing-prototypes -Wpointe > r-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions > -Wno-unknown-pragmas -Wno-missing-prototypes -Wno-undef > -Wno-strict-prototypes -Wno-cast-qual -Wno-parentheses -Wno-redundant-decls > -Wno-missing-braces -Wno-uninitialized -Wno-unused -Wno-inline -Wno-switch > -Wno-pointer-arith -c > /src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c > /src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c: > In function 'arc_memory_throttle': > /src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c:3300: > error: redefinition of 'available_memory' > /src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c:3299: > error: previous definition of 'available_memory' was here > *** Error code 1
Sorry for the breakage. And in stable/8 too. Late night MFC and such a trivial mistake in such a trivial merge. -- Andriy Gapon _______________________________________________ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
