From b8b7fc0fa70d1a7d7791e15f0348ebe04f66271a Mon Sep 17 00:00:00 2001 From: jhibbits Date: Thu, 19 Jul 2018 21:06:58 +0000 Subject: [PATCH] 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. --- sys/powerpc/include/pmap.h | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/sys/powerpc/include/pmap.h b/sys/powerpc/include/pmap.h index 8d1cc5aaa0ff..d96de742e500 100644 --- a/sys/powerpc/include/pmap.h +++ b/sys/powerpc/include/pmap.h @@ -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)) @@ -221,20 +232,6 @@ struct pmap { }; #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)