From owner-svn-src-stable@freebsd.org Fri Dec 23 03:19:49 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DBB00C8C639; Fri, 23 Dec 2016 03:19:49 +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 mx1.freebsd.org (Postfix) with ESMTPS id 857AA11A5; Fri, 23 Dec 2016 03:19:49 +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 uBN3JmQP095214; Fri, 23 Dec 2016 03:19:48 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBN3JmKK095211; Fri, 23 Dec 2016 03:19:48 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201612230319.uBN3JmKK095211@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Fri, 23 Dec 2016 03:19:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r310442 - in stable/11/sys/powerpc: booke powerpc X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Dec 2016 03:19:50 -0000 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) {