From owner-freebsd-current@freebsd.org Tue Aug 2 14:52:57 2016 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B880FBACF2D for ; Tue, 2 Aug 2016 14:52:57 +0000 (UTC) (envelope-from mad@madpilot.net) Received: from mail.madpilot.net (grunt.madpilot.net [78.47.145.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7AFB51A4F for ; Tue, 2 Aug 2016 14:52:56 +0000 (UTC) (envelope-from mad@madpilot.net) Received: from mail (mail [192.168.254.3]) by mail.madpilot.net (Postfix) with ESMTP id 3s3fM34F4gzZrR; Tue, 2 Aug 2016 16:52:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=madpilot.net; h= content-transfer-encoding:content-type:content-type:in-reply-to :mime-version:user-agent:date:date:message-id:from:from :references:subject:subject:received:received; s=mail; t= 1470149565; x=1471963966; bh=rrqnbb26RP5MtN/9UD8mX1SNBxWpoT6Jsf5 WoU4Qw4U=; b=omTHN6193V5ZniFdTf/2/xiU7TSOqs0OH4WkX2ZrbUPKXmQfiFx kFkUEyRbb+s2BvB8rapN8Rpvq1REnQ9BlrPOIvyUnBhhJmVUyLqM28wvrPApaZRC RvW/57ljMe0NPESMqOkQre46h6MYJCkV5HTTdEzVAVGJy+rBmFLYWO9o= Received: from mail.madpilot.net ([192.168.254.3]) by mail (mail.madpilot.net [192.168.254.3]) (amavisd-new, port 10024) with ESMTP id FF79sFnVqaLW; Tue, 2 Aug 2016 16:52:45 +0200 (CEST) Received: from marvin.madpilot.net (micro.madpilot.net [88.149.173.206]) by mail.madpilot.net (Postfix) with ESMTPSA; Tue, 2 Aug 2016 16:52:45 +0200 (CEST) Subject: Re: SVN r303643 breaks non-SMP compilation To: Mateusz Guzik , Michael Butler , freebsd-current References: <6a9f68a7-8b1c-92cd-1409-fe574602a005@protected-networks.net> <20160802030624.GA24961@dft-labs.eu> From: Guido Falsi Message-ID: Date: Tue, 2 Aug 2016 16:52:45 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20160802030624.GA24961@dft-labs.eu> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 14:52:57 -0000 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 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 +#include #endif #ifdef DDB -- Guido Falsi