On Fri, Jul 15, 2016 at 05:59:46AM +0000, Nick Hudson wrote: > Module Name: src > Committed By: skrll > Date: Fri Jul 15 05:59:46 UTC 2016 > > Modified Files: > src/sys/arch/arm/arm32: arm32_machdep.c > > Log Message: > Provide a mm_md_page_color and fix some kernel builds > >
Seems it broke the rest of them. I can build with this diff, but I don't know if it is correct.
Index: arm32_machdep.c =================================================================== RCS file: /cvsroot/src/sys/arch/arm/arm32/arm32_machdep.c,v retrieving revision 1.111 diff -u -r1.111 arm32_machdep.c --- arm32_machdep.c 15 Jul 2016 05:59:46 -0000 1.111 +++ arm32_machdep.c 15 Jul 2016 19:31:34 -0000 @@ -746,11 +746,3 @@ return rv; } #endif - -bool -mm_md_page_color(paddr_t pa, int *colorp) -{ - *colorp = atop(pa & arm_cache_prefer_mask); - - return arm_cache_prefer_mask ? false : true; -} Index: pmap.c =================================================================== RCS file: /cvsroot/src/sys/arch/arm/arm32/pmap.c,v retrieving revision 1.335 diff -u -r1.335 pmap.c --- pmap.c 14 Jul 2016 15:51:41 -0000 1.335 +++ pmap.c 15 Jul 2016 19:31:37 -0000 @@ -519,6 +519,13 @@ vaddr_t pmap_directlimit; #endif +static inline bool +mm_md_page_color(paddr_t pa, int *colorp) +{ + *colorp = atop(pa & arm_cache_prefer_mask); + + return arm_cache_prefer_mask ? false : true; +} /* * Misc. locking data structures */ @@ -7945,3 +7952,4 @@ #endif } #endif /* __HAVE_MM_MD_DIRECT_MAPPED_PHYS */ +