[releng_10 tinderbox] failure on i386/i386

[Cy Schubert]

In message <201401301859.s0UIxd71069586 at worker01.tb.des.no>, FreeBSD 
Tinderbox
writes:
> TB --- 2014-01-30 15:00:42 - tinderbox 2.20 running on worker01.tb.des.no
> TB --- 2014-01-30 15:00:42 - FreeBSD worker01.tb.des.no 9.1-RELEASE-p4 FreeBS
> D 9.1-RELEASE-p4 #0: Mon Jun 17 11:42:37 UTC 2013     root at amd64-builder.daem
> onology.net:/usr/obj/usr/src/sys/GENERIC  amd64
> TB --- 2014-01-30 15:00:42 - starting RELENG_10 tinderbox run for i386/i386
> TB --- 2014-01-30 15:00:42 - cleaning the object tree
> TB --- 2014-01-30 15:01:39 - /usr/local/bin/svn stat --no-ignore /src
> TB --- 2014-01-30 15:01:45 - At svn revision 261289
> TB --- 2014-01-30 15:01:46 - building world
> TB --- 2014-01-30 15:01:46 - CROSS_BUILD_TESTING=YES
> TB --- 2014-01-30 15:01:46 - MAKEOBJDIRPREFIX=/obj
> TB --- 2014-01-30 15:01:46 - PATH=/usr/bin:/usr/sbin:/bin:/sbin
> TB --- 2014-01-30 15:01:46 - SRCCONF=/dev/null
> TB --- 2014-01-30 15:01:46 - TARGET=i386
> TB --- 2014-01-30 15:01:46 - TARGET_ARCH=i386
> TB --- 2014-01-30 15:01:46 - TZ=UTC
> TB --- 2014-01-30 15:01:46 - __MAKE_CONF=/dev/null
> TB --- 2014-01-30 15:01:46 - cd /src
> TB --- 2014-01-30 15:01:46 - /usr/bin/make -B buildworld
> >>> Building an up-to-date make(1)
> >>> World build started on Thu Jan 30 15:01:57 UTC 2014
> >>> Rebuilding the temporary build tree
> >>> stage 1.1: legacy release compatibility shims
> >>> stage 1.2: bootstrap tools
> >>> stage 2.1: cleaning up the object tree
> >>> stage 2.2: rebuilding the object tree
> >>> stage 2.3: build tools
> >>> stage 3: cross tools
> >>> stage 4.1: building includes
> >>> stage 4.2: building libraries
> >>> stage 4.3: make dependencies
> >>> stage 4.4: building everything
> >>> World build completed on Thu Jan 30 18:35:38 UTC 2014
> TB --- 2014-01-30 18:35:38 - generating LINT kernel config
> TB --- 2014-01-30 18:35:38 - cd /src/sys/i386/conf
> TB --- 2014-01-30 18:35:38 - /usr/bin/make -B LINT
> TB --- 2014-01-30 18:35:38 - cd /src/sys/i386/conf
> TB --- 2014-01-30 18:35:38 - /usr/sbin/config -m LINT
> TB --- 2014-01-30 18:35:38 - building LINT kernel
> TB --- 2014-01-30 18:35:38 - CROSS_BUILD_TESTING=YES
> TB --- 2014-01-30 18:35:38 - MAKEOBJDIRPREFIX=/obj
> TB --- 2014-01-30 18:35:38 - PATH=/usr/bin:/usr/sbin:/bin:/sbin
> TB --- 2014-01-30 18:35:38 - SRCCONF=/dev/null
> TB --- 2014-01-30 18:35:38 - TARGET=i386
> TB --- 2014-01-30 18:35:38 - TARGET_ARCH=i386
> TB --- 2014-01-30 18:35:38 - TZ=UTC
> TB --- 2014-01-30 18:35:38 - __MAKE_CONF=/dev/null
> TB --- 2014-01-30 18:35:38 - cd /src
> TB --- 2014-01-30 18:35:38 - /usr/bin/make -B buildkernel KERNCONF=LINT
> >>> Kernel build for LINT started on Thu Jan 30 18:35:38 UTC 2014
> >>> stage 1: configuring the kernel
> >>> stage 2.1: cleaning up the object tree
> >>> stage 2.2: rebuilding the object tree
> >>> stage 2.3: build tools
> >>> stage 3.1: making dependencies
> >>> stage 3.2: building everything
> [...]
> In file included from /src/sys/contrib/dev/acpica/include/platform/acfreebsd.
> h:73:
> /src/sys/sys/systm.h:306:20: error: redefinition of 'cpu_ticks' as different 
> kind of symbol
> extern cpu_tick_f *cpu_ticks;
>                    ^
> ./machine/cpu.h:86:10: note: previous definition is here
>         return (cpu_ticks());
>                 ^
> 2 errors generated.
> *** Error code 1
> 
> Stop.
> bmake[1]: stopped in /obj/i386.i386/src/sys/LINT
> *** Error code 1
> 
> Stop.
> bmake: stopped in /src
> *** [buildkernel] Error code 1
> 
> Stop in /src.
> TB --- 2014-01-30 18:59:38 - WARNING: /usr/bin/make returned exit code  1 
> TB --- 2014-01-30 18:59:38 - ERROR: failed to build LINT kernel
> TB --- 2014-01-30 18:59:38 - 10816.16 user 3442.55 system 14336.69 real


Haven't tested this yet but this should fix 10-STABLE and -CURRENT.

Index: acpi_wakeup.c
===================================================================
--- acpi_wakeup.c	(revision 261221)
+++ acpi_wakeup.c	(working copy)
@@ -43,7 +43,9 @@
 #include <vm/pmap.h>
 
 #include <machine/clock.h>
+#ifdef __amd64__
 #include <machine/cpu.h>
+#endif
 #include <machine/intr_machdep.h>
 #include <x86/mca.h>
 #include <machine/pcb.h>


-- 
Cheers,
Cy Schubert <Cy.Schubert at komquats.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.