SVN r303643 breaks non-SMP compilation

0 views
Skip to first unread message

Michael Butler

unread,
Aug 1, 2016, 9:50:13 PM8/1/16
to
In the non-SMP case, ADAPTIVE_MUTEXES is not defined and a subsequent
reference to mtx_delay causes compilation of kern_mutex.c to fail
because KDTRACE_HOOKS may be,

imb
_______________________________________________
freebsd...@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-curre...@freebsd.org"

Mateusz Guzik

unread,
Aug 1, 2016, 11:06:57 PM8/1/16
to
On Mon, Aug 01, 2016 at 09:49:03PM -0400, Michael Butler wrote:
> In the non-SMP case, ADAPTIVE_MUTEXES is not defined and a subsequent
> reference to mtx_delay causes compilation of kern_mutex.c to fail
> because KDTRACE_HOOKS may be,
>

Indeed, fixed in r303655.

Thanks for reporting.
--
Mateusz Guzik <mjguzik gmail.com>

Guido Falsi

unread,
Aug 2, 2016, 10:53:21 AM8/2/16
to
On 08/02/16 05:06, Mateusz Guzik wrote:
> On Mon, Aug 01, 2016 at 09:49:03PM -0400, Michael Butler wrote:
>> In the non-SMP case, ADAPTIVE_MUTEXES is not defined and a subsequent
>> reference to mtx_delay causes compilation of kern_mutex.c to fail
>> because KDTRACE_HOOKS may be,
>>
>
> Indeed, fixed in r303655.
>
> Thanks for reporting.
>

I've noticed another failure in the same file, caused by r303643.

It's failing to compile here due to errors about SYSINIT(9), it looks
like #include <sys/kernel.h> is missing.

I have made a local patch which compiles and afdter a reboot seems to
work fine:

Index: head/sys/kern/kern_sx.c
===================================================================
--- head/sys/kern/kern_sx.c (revision 303658)
+++ head/sys/kern/kern_sx.c (working copy)
@@ -58,6 +58,7 @@

#if defined(SMP) && !defined(NO_ADAPTIVE_SX)
#include <machine/cpu.h>
+#include <sys/kernel.h>
#endif

#ifdef DDB


--
Guido Falsi <m...@madpilot.net>
Reply all
Reply to author
Forward
0 new messages