svn commit: r310442 - in stable/11/sys/powerpc: booke powerpc

[Justin Hibbits]

Author: jhibbits
Date: Fri Dec 23 03:19:48 2016
New Revision: 310442
URL: https://svnweb.freebsd.org/changeset/base/310442

Log:
  MFC r304052:
  
    Add missing pmap_kremove() method for book-e.

Modified:
  stable/11/sys/powerpc/booke/pmap.c
  stable/11/sys/powerpc/powerpc/mmu_if.m
  stable/11/sys/powerpc/powerpc/pmap_dispatch.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/powerpc/booke/pmap.c
==============================================================================
--- stable/11/sys/powerpc/booke/pmap.c	Fri Dec 23 03:14:05 2016	(r310441)
+++ stable/11/sys/powerpc/booke/pmap.c	Fri Dec 23 03:19:48 2016	(r310442)
@@ -385,7 +385,7 @@ static mmu_method_t mmu_booke_methods[] 
 	MMUMETHOD(mmu_kenter,		mmu_booke_kenter),
 	MMUMETHOD(mmu_kenter_attr,	mmu_booke_kenter_attr),
 	MMUMETHOD(mmu_kextract,		mmu_booke_kextract),
-/*	MMUMETHOD(mmu_kremove,		mmu_booke_kremove),	*/
+	MMUMETHOD(mmu_kremove,		mmu_booke_kremove),
 	MMUMETHOD(mmu_unmapdev,		mmu_booke_unmapdev),
 	MMUMETHOD(mmu_change_attr,	mmu_booke_change_attr),
 

Modified: stable/11/sys/powerpc/powerpc/mmu_if.m
==============================================================================
--- stable/11/sys/powerpc/powerpc/mmu_if.m	Fri Dec 23 03:14:05 2016	(r310441)
+++ stable/11/sys/powerpc/powerpc/mmu_if.m	Fri Dec 23 03:19:48 2016	(r310442)
@@ -870,6 +870,16 @@ METHOD void kenter_attr {
 } DEFAULT mmu_null_kenter_attr;
 
 /**
+ * @brief Unmap a wired page from kernel virtual address space
+ *
+ * @param _va		mapped virtual address
+ */
+METHOD void kremove {
+	mmu_t		_mmu;
+	vm_offset_t	_va;
+};
+
+/**
  * @brief Determine if the given physical address range has been direct-mapped.
  *
  * @param _pa		physical address start

Modified: stable/11/sys/powerpc/powerpc/pmap_dispatch.c
==============================================================================
--- stable/11/sys/powerpc/powerpc/pmap_dispatch.c	Fri Dec 23 03:14:05 2016	(r310441)
+++ stable/11/sys/powerpc/powerpc/pmap_dispatch.c	Fri Dec 23 03:19:48 2016	(r310442)
@@ -510,6 +510,14 @@ pmap_kenter_attr(vm_offset_t va, vm_offs
 	MMU_KENTER_ATTR(mmu_obj, va, pa, ma);
 }
 
+void
+pmap_kremove(vm_offset_t va)
+{
+
+	CTR2(KTR_PMAP, "%s(%#x)", __func__, va);
+	return (MMU_KREMOVE(mmu_obj, va));
+}
+
 boolean_t
 pmap_dev_direct_mapped(vm_paddr_t pa, vm_size_t size)
 {