From owner-svn-src-head@freebsd.org  Thu May  7 17:58:08 2020
Return-Path: <owner-svn-src-head@freebsd.org>
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 5FDBB2DFD30;
 Thu,  7 May 2020 17:58:08 +0000 (UTC)
 (envelope-from bdragon@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 49J1Qm1sq8z4V3p;
 Thu,  7 May 2020 17:58:08 +0000 (UTC)
 (envelope-from bdragon@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 3B7321CF8E;
 Thu,  7 May 2020 17:58:08 +0000 (UTC)
 (envelope-from bdragon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 047Hw8PR071153;
 Thu, 7 May 2020 17:58:08 GMT (envelope-from bdragon@FreeBSD.org)
Received: (from bdragon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 047Hw8aj071152;
 Thu, 7 May 2020 17:58:08 GMT (envelope-from bdragon@FreeBSD.org)
Message-Id: <202005071758.047Hw8aj071152@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdragon set sender to
 bdragon@FreeBSD.org using -f
From: Brandon Bergren <bdragon@FreeBSD.org>
Date: Thu, 7 May 2020 17:58:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r360788 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: bdragon
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 360788
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.30
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 May 2020 17:58:08 -0000

Author: bdragon
Date: Thu May  7 17:58:07 2020
New Revision: 360788
URL: https://svnweb.freebsd.org/changeset/base/360788

Log:
  [PowerPC] Fix powerpcspe build failure after r360569
  
  On powerpcspe, vm_paddr_t is 64 bit despite it being a 32 bit platform.
  Adjust compile time assertion to compensate.

Modified:
  head/sys/kern/uipc_mbuf.c

Modified: head/sys/kern/uipc_mbuf.c
==============================================================================
--- head/sys/kern/uipc_mbuf.c	Thu May  7 17:00:51 2020	(r360787)
+++ head/sys/kern/uipc_mbuf.c	Thu May  7 17:58:07 2020	(r360788)
@@ -167,7 +167,12 @@ CTASSERT(sizeof(struct m_ext) == 160);
 #else
 CTASSERT(offsetof(struct mbuf, m_dat) == 24);
 CTASSERT(sizeof(struct pkthdr) == 48);
+#if defined(__powerpc__) && defined(BOOKE)
+/* PowerPC booke has 64-bit physical pointers. */
+CTASSERT(sizeof(struct m_ext) == 184);
+#else
 CTASSERT(sizeof(struct m_ext) == 180);
+#endif
 #endif
 
 /*