From owner-svn-src-all@freebsd.org Wed Feb 17 13:29:19 2016 Return-Path: Delivered-To: svn-src-all@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 89762AAA15B; Wed, 17 Feb 2016 13:29:19 +0000 (UTC) (envelope-from skra@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 42CB51AF6; Wed, 17 Feb 2016 13:29:19 +0000 (UTC) (envelope-from skra@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1HDTIF1030872; Wed, 17 Feb 2016 13:29:18 GMT (envelope-from skra@FreeBSD.org) Received: (from skra@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1HDTIUq030869; Wed, 17 Feb 2016 13:29:18 GMT (envelope-from skra@FreeBSD.org) Message-Id: <201602171329.u1HDTIUq030869@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: skra set sender to skra@FreeBSD.org using -f From: Svatopluk Kraus Date: Wed, 17 Feb 2016 13:29:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r295696 - in head/sys/arm: arm include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Feb 2016 13:29:19 -0000 Author: skra Date: Wed Feb 17 13:29:17 2016 New Revision: 295696 URL: https://svnweb.freebsd.org/changeset/base/295696 Log: Remove unneeded vector_page_setprot() for __ARM_ARCH >= 6. A vector page is always mapped in KVA space and so it's always writeable. Modified: head/sys/arm/arm/fiq.c head/sys/arm/arm/pmap-v6.c head/sys/arm/include/pmap-v6.h Modified: head/sys/arm/arm/fiq.c ============================================================================== --- head/sys/arm/arm/fiq.c Wed Feb 17 12:57:05 2016 (r295695) +++ head/sys/arm/arm/fiq.c Wed Feb 17 13:29:17 2016 (r295696) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -73,13 +74,13 @@ fiq_installhandler(void *func, size_t si { const uint32_t fiqvector = 7 * sizeof(uint32_t); -#if !defined(__ARM_FIQ_INDIRECT) +#if __ARM_ARCH < 6 && !defined(__ARM_FIQ_INDIRECT) vector_page_setprot(VM_PROT_READ|VM_PROT_WRITE); #endif memcpy((void *)(vector_page + fiqvector), func, size); -#if !defined(__ARM_FIQ_INDIRECT) +#if __ARM_ARCH < 6 && !defined(__ARM_FIQ_INDIRECT) vector_page_setprot(VM_PROT_READ); #endif icache_sync((vm_offset_t) fiqvector, size); Modified: head/sys/arm/arm/pmap-v6.c ============================================================================== --- head/sys/arm/arm/pmap-v6.c Wed Feb 17 12:57:05 2016 (r295695) +++ head/sys/arm/arm/pmap-v6.c Wed Feb 17 13:29:17 2016 (r295696) @@ -6314,11 +6314,6 @@ pte1_setrw: return (KERN_FAILURE); } -/* !!!! REMOVE !!!! */ -void vector_page_setprot(int p) -{ -} - #if defined(PMAP_DEBUG) /* * Reusing of KVA used in pmap_zero_page function !!! Modified: head/sys/arm/include/pmap-v6.h ============================================================================== --- head/sys/arm/include/pmap-v6.h Wed Feb 17 12:57:05 2016 (r295695) +++ head/sys/arm/include/pmap-v6.h Wed Feb 17 13:29:17 2016 (r295696) @@ -243,11 +243,6 @@ void pmap_preboot_map_attr(vm_paddr_t, v */ #define PMAP_DOMAIN_KERNEL 0 /* The kernel uses domain #0 */ -/* - * sys/arm/arm/cpufunc.c - */ -void vector_page_setprot(int); - #endif /* _KERNEL */ // -----------------------------------------------------------------------------