[current tinderbox] failure on i386/i386

[Tai-hwa Liang]

Looks like src/sys/kern/subr_param.c:1.68 breaks the build. Would someone
please commit following patch?

--- sys/kern/subr_param.c	Tue Nov 30 10:37:15 2004
+++ sys/kern/subr_param.c.orig	Tue Nov 30 10:49:34 2004
@@ -51,11 +51,11 @@
   */

  #ifndef HZ
-#  elif defined(__amd64__) || defined(__i386__) || defined(__ia64__)
+#  if defined(__amd64__) || defined(__i386__) || defined(__ia64__)
  #    define	HZ 1000
  #  else
  #    define	HZ 100
-#endif
+#  endif
  #endif
  #define	NPROC (20 + 16 * maxusers)
  #ifndef NBUF

On Mon, 29 Nov 2004, FreeBSD Tinderbox wrote:
[...]
> awk -f /tinderbox/CURRENT/i386/i386/src/sys/tools/makeobjops.awk /tinderbox/CURRENT/i386/i386/src/sys/pci/agp_if.m -h
> awk -f /tinderbox/CURRENT/i386/i386/src/sys/tools/makeobjops.awk /tinderbox/CURRENT/i386/i386/src/sys/dev/acpica/acpi_if.m -h
> if [ -f .olddep ]; then mv .olddep .depend; fi
> rm -f .newdep
> /home/tinderbox/CURRENT/i386/i386/obj/tinderbox/CURRENT/i386/i386/src/make.i386/make -V CFILES -V SYSTEM_CFILES -V GEN_CFILES |  MKDEP_CPP="cc -E" CC="cc" xargs mkdep -a -f .newdep -O2 -pipe -fno-strict-aliasing  -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -g -nostdinc -I-  -I. -I/tinderbox/CURRENT/i386/i386/src/sys -I/tinderbox/CURRENT/i386/i386/src/sys/contrib/dev/acpica -I/tinderbox/CURRENT/i386/i386/src/sys/contrib/altq -I/tinderbox/CURRENT/i386/i386/src/sys/contrib/ipfilter -I/tinderbox/CURRENT/i386/i386/src/sys/contrib/pf -I/tinderbox/CURRENT/i386/i386/src/sys/contrib/dev/ath -I/tinderbox/CURRENT/i386/i386/src/sys/contrib/dev/ath/freebsd -I/tinderbox/CURRENT/i386/i386/src/sys/contrib/ngatm -D_KERNEL -include opt_global.h -fno-common -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000  -mno-align-long-strings -mpreferred-stack-boun
 da
> ry=2 -ffreestanding
> /tinderbox/CURRENT/i386/i386/src/sys/kern/subr_param.c:59:2: #endif without #if
> mkdep: compile failed
> *** Error code 1
>
> Stop in /tinderbox/CURRENT/i386/i386/obj/tinderbox/CURRENT/i386/i386/src/sys/GENERIC.
> *** Error code 1
>
> Stop in /tinderbox/CURRENT/i386/i386/obj/tinderbox/CURRENT/i386/i386/src/sys/GENERIC.
> *** Error code 1
>
> Stop in /tinderbox/CURRENT/i386/i386/src.
> *** Error code 1
>
> Stop in /tinderbox/CURRENT/i386/i386/src.
> TB --- 2004-11-30 02:14:54 - WARNING: /usr/bin/make returned exit code  1
> TB --- 2004-11-30 02:14:54 - ERROR: failed to build generic kernel
> TB --- 2004-11-30 02:14:54 - tinderbox aborted