[releng_10 tinderbox] failure on i386/i386

[David Wolfskill]

On Thu, Jan 30, 2014 at 12:47:44PM -0800, Cy Schubert wrote:
> In message <201401301859.s0UIxd71069586 at worker01.tb.des.no>, FreeBSD 
> Tinderbox
> writes:
> > ...
> > >>> 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>
> ...

I encountered the above in my GENERIC-based laptop kernel ("CANARY"),
and Cy's suggested fix does allow me to build, install, and boot a new
kernel that seems to work:

FreeBSD g1-251.catwhisker.org 10.0-STABLE FreeBSD 10.0-STABLE #1144  r261313M/261318:1000702: Fri Jan 31 05:10:02 PST 2014     root at g1-251.catwhisker.org:/common/S3/obj/usr/src/sys/CANARY  i386

Yesterday, I had updated sources to stable/10 @r261288; today, @r261313
(as depicted above).

Peace,
david
-- 
David H. Wolfskill				david at catwhisker.org
Taliban: Evil cowards with guns afraid of truth from a 14-year old girl.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 964 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-i386/attachments/20140131/e2c29ee1/attachment.sig>