SVN r303643 breaks non-SMP compilation

Guido Falsi mad at madpilot.net
Tue Aug 2 14:52:57 UTC 2016


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 <mad at madpilot.net>


More information about the freebsd-current mailing list