From owner-svn-src-head@freebsd.org Tue Mar 31 20:15:42 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E99E426A7DC; Tue, 31 Mar 2020 20:15:42 +0000 (UTC) (envelope-from rpokala@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48sLDZ0ws1z3Lwf; Tue, 31 Mar 2020 20:15:42 +0000 (UTC) (envelope-from rpokala@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 94CD5FD65; Tue, 31 Mar 2020 20:09:20 +0000 (UTC) (envelope-from rpokala@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02VK9Kt0051093; Tue, 31 Mar 2020 20:09:20 GMT (envelope-from rpokala@FreeBSD.org) Received: (from rpokala@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02VK9KNJ051092; Tue, 31 Mar 2020 20:09:20 GMT (envelope-from rpokala@FreeBSD.org) Message-Id: <202003312009.02VK9KNJ051092@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rpokala set sender to rpokala@FreeBSD.org using -f From: Ravi Pokala Date: Tue, 31 Mar 2020 20:09:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359493 - head/sys/mips/nlm/dev/net X-SVN-Group: head X-SVN-Commit-Author: rpokala X-SVN-Commit-Paths: head/sys/mips/nlm/dev/net X-SVN-Commit-Revision: 359493 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Mar 2020 20:15:43 -0000 Author: rpokala Date: Tue Mar 31 20:09:20 2020 New Revision: 359493 URL: https://svnweb.freebsd.org/changeset/base/359493 Log: Fix build for mips.XLP64 kernel, by re-ordering headers The log for the failure contained errors like this: | In file included from ${SRCTOP}/sys/mips/nlm/dev/net/xlpge.c:34: | In file included from ${SRCTOP}/sys/sys/systm.h:44: | In file included from ./machine/atomic.h:849: | ${SRCTOP}/sys/sys/_atomic_subword.h:222:37: error: unknown type name 'u_long'; did you mean 'long'? | atomic_testandset_acq_long(volatile u_long *p, u_int v) | ^~~~~~ | long And similar "unknown type name" errors for u_int, not recognizing bool as a type, etc. This was caused by including too far down; move it up where it belongs. While here, add a blank line after '__FBSDID()', in keeping with convention. Reviewed by: emaste Sponsored by: Panasas Differential Revision: https://reviews.freebsd.org/D24242 Modified: head/sys/mips/nlm/dev/net/xlpge.c Modified: head/sys/mips/nlm/dev/net/xlpge.c ============================================================================== --- head/sys/mips/nlm/dev/net/xlpge.c Tue Mar 31 17:57:11 2020 (r359492) +++ head/sys/mips/nlm/dev/net/xlpge.c Tue Mar 31 20:09:20 2020 (r359493) @@ -30,10 +30,11 @@ #include __FBSDID("$FreeBSD$"); + +#include #include #include #include -#include #include #include #include