Date: Fri, 31 Jan 2014 05:33:40 -0800 From: David Wolfskill <david@catwhisker.org> To: stable@freebsd.org, i386@freebsd.org Subject: Re: [releng_10 tinderbox] failure on i386/i386 Message-ID: <20140131133340.GH1620@albert.catwhisker.org> In-Reply-To: <201401302047.s0UKliXK005726@slippy.cwsent.com> References: <tinderbox@freebsd.org> <201401301859.s0UIxd71069586@worker01.tb.des.no> <201401302047.s0UKliXK005726@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Thu, Jan 30, 2014 at 12:47:44PM -0800, Cy Schubert wrote:
> In message <201401301859.s0UIxd71069586@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@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@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.
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (FreeBSD)
iQJ8BAEBCgBmBQJS66YzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4RThEMDY4QTIxMjc1MDZFRDIzODYzRTc4
QTY3RjlDOERFRjQxOTNCAAoJEIpn+cje9Bk7OmkP/1vcjeRwxZHFirxjKLYVDHv7
GoaurAnXaFF6k6khXJJCA0yLyU9TJIN8Oq2VdIdRtrj6xeEKEoYiQRjEK4JKaIMQ
4eR+nwxhGTtIMW2CFDIVYnlGkNO1zpjrC4bkSdcfDHLK4NWWPjw93QI1/R+m8eHC
QDJAcEVN+ibHZ8+MIFu+r2zWioruzKr2axGqSWzFD+gYOb7HwbAq3o0QssioJDTg
P5tqH/c+YbOtnjRrYSOdAyn1vDMLdWYOIEyTrq3VlznTipSfiGBmK/EkwPE7iZLj
UkTNgAPc1zUdlkeDa/B9UhWL4K7HeUa5FpbOKc7anVjULUUvpBkwK6dx9y3xkY2T
xwMiEjBX47LPiHACL12eh5jV9ZQqQOT87T16pt1n1fZ5m9U7Bl10z/aeiQ+Crgyx
oYRiltHaxx7rTD7NLEH7tx8A2OH3Fm077EXtqsp+VSIxDtB3B7G8lrr+v/kFQ/wz
H7NYOCwAUTb3lc/mwEvBLr9t7rMEzZ8JHkLoJi3fcMXypQug/y1EVWHTvmVYSiM6
+I7kaxDtjnhbP/RYd/qx0ahc5kuTkgsJPL5SqsyRcaLUAdCM8kX9qIVoPIlJyycU
5bSN5vmGfr6kcIfJ826NNBy7qfMm+BEL6B+1lOh/P/lv2w1jscIYSFwuCcRXQn9T
vDwdS7uEErYsW8crDGjl
=Awiz
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140131133340.GH1620>