From owner-svn-src-all@freebsd.org  Wed Dec 18 01:56:39 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 85E011D049C;
 Wed, 18 Dec 2019 01:56:39 +0000 (UTC)
 (envelope-from markj@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 47cymR2xGFz421w;
 Wed, 18 Dec 2019 01:56:39 +0000 (UTC)
 (envelope-from markj@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 5FDF91F076;
 Wed, 18 Dec 2019 01:56:39 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBI1udlf001526;
 Wed, 18 Dec 2019 01:56:39 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBI1udpn001525;
 Wed, 18 Dec 2019 01:56:39 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201912180156.xBI1udpn001525@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Wed, 18 Dec 2019 01:56:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r355874 - head/sys/vm
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/sys/vm
X-SVN-Commit-Revision: 355874
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Dec 2019 01:56:39 -0000

Author: markj
Date: Wed Dec 18 01:56:38 2019
New Revision: 355874
URL: https://svnweb.freebsd.org/changeset/base/355874

Log:
  Fix the aflag shift on big-endian platforms after r355672.
  
  The structure offset is zero regardless of endianness.
  
  Reported by:	brooks
  Pointy hat:	markj

Modified:
  head/sys/vm/vm_page.h

Modified: head/sys/vm/vm_page.h
==============================================================================
--- head/sys/vm/vm_page.h	Wed Dec 18 01:37:00 2019	(r355873)
+++ head/sys/vm/vm_page.h	Wed Dec 18 01:56:38 2019	(r355874)
@@ -763,7 +763,11 @@ void vm_page_assert_pga_writeable(vm_page_t m, uint16_
 #define	VM_PAGE_ASSERT_PGA_WRITEABLE(m, bits)	(void)0
 #endif
 
-#define	VM_PAGE_AFLAG_SHIFT	(__offsetof(vm_page_astate_t, flags) * NBBY)
+#if BYTE_ORDER == BIG_ENDIAN
+#define	VM_PAGE_AFLAG_SHIFT	16
+#else
+#define	VM_PAGE_AFLAG_SHIFT	0
+#endif
 
 /*
  *	Load a snapshot of a page's 32-bit atomic state.