From owner-svn-src-head@freebsd.org Thu Jul 19 21:06:59 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9CD79104B2D4; Thu, 19 Jul 2018 21:06:59 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 43FB77C7A6; Thu, 19 Jul 2018 21:06:59 +0000 (UTC) (envelope-from jhibbits@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 18C092E869; Thu, 19 Jul 2018 21:06:59 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6JL6w8w067871; Thu, 19 Jul 2018 21:06:58 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6JL6wYQ067870; Thu, 19 Jul 2018 21:06:58 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201807192106.w6JL6wYQ067870@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Thu, 19 Jul 2018 21:06:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336517 - head/sys/powerpc/include X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/include X-SVN-Commit-Revision: 336517 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.27 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: Thu, 19 Jul 2018 21:06:59 -0000 Author: jhibbits Date: Thu Jul 19 21:06:58 2018 New Revision: 336517 URL: https://svnweb.freebsd.org/changeset/base/336517 Log: Revert r336509. Fails buildworld. I had naively assumed that building kernel would be sufficient to test that the header is sane. However, it turns out this now needs -fms-extensions to build. Rather than sprinkling -fms-extensions all over the place, revert for now, and revisit with a better fix. Modified: head/sys/powerpc/include/pmap.h Modified: head/sys/powerpc/include/pmap.h ============================================================================== --- head/sys/powerpc/include/pmap.h Thu Jul 19 20:58:59 2018 (r336516) +++ head/sys/powerpc/include/pmap.h Thu Jul 19 21:06:58 2018 (r336517) @@ -150,6 +150,12 @@ struct pmap { struct pvo_tree pmap_pvo; }; +struct md_page { + volatile int32_t mdpg_attrs; + vm_memattr_t mdpg_cache_attrs; + struct pvo_head mdpg_pvoh; +}; + #define pmap_page_get_memattr(m) ((m)->md.mdpg_cache_attrs) #define pmap_page_is_mapped(m) (!LIST_EMPTY(&(m)->md.mdpg_pvoh)) @@ -206,6 +212,11 @@ struct pv_entry { }; typedef struct pv_entry *pv_entry_t; +struct md_page { + TAILQ_HEAD(, pv_entry) pv_list; + int pv_tracked; +}; + #define pmap_page_get_memattr(m) VM_MEMATTR_DEFAULT #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) @@ -220,20 +231,6 @@ struct pmap { struct mtx pm_mtx; /* pmap mutex */ }; #endif /* AIM */ - -struct md_page { - union { - struct md_page_booke { - TAILQ_HEAD(, pv_entry) pv_list; - int pv_tracked; - }; - struct md_page_aim { - volatile int32_t mdpg_attrs; - vm_memattr_t mdpg_cache_attrs; - struct pvo_head mdpg_pvoh; - }; - }; -}; extern struct pmap kernel_pmap_store; #define kernel_pmap (&kernel_pmap_store)