From owner-svn-src-projects@FreeBSD.ORG Thu Jul 31 14:47:27 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 94DE4680; Thu, 31 Jul 2014 14:47:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 68B89289D; Thu, 31 Jul 2014 14:47:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6VElRvZ027046; Thu, 31 Jul 2014 14:47:27 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6VElRCA027044; Thu, 31 Jul 2014 14:47:27 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201407311447.s6VElRCA027044@svn.freebsd.org> From: Andrew Turner Date: Thu, 31 Jul 2014 14:47:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r269332 - in projects/arm64/sys: arm/arm conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jul 2014 14:47:27 -0000 Author: andrew Date: Thu Jul 31 14:47:26 2014 New Revision: 269332 URL: http://svnweb.freebsd.org/changeset/base/269332 Log: Use arm/arm/devmap.c to get pmap_{un,}mapdev. As we don't yet need the rest of the code, for now, comment it out. Modified: projects/arm64/sys/arm/arm/devmap.c projects/arm64/sys/conf/files.arm64 Modified: projects/arm64/sys/arm/arm/devmap.c ============================================================================== --- projects/arm64/sys/arm/arm/devmap.c Thu Jul 31 13:02:56 2014 (r269331) +++ projects/arm64/sys/arm/arm/devmap.c Thu Jul 31 14:47:26 2014 (r269332) @@ -39,6 +39,8 @@ __FBSDID("$FreeBSD$"); #include #include #include + +#if 0 #include static const struct arm_devmap_entry *devmap_table; @@ -232,6 +234,7 @@ arm_devmap_vtop(void * vpva, vm_size_t s return (DEVMAP_PADDR_NOTFOUND); } +#endif /* * Map a set of physical memory pages into the kernel virtual address space. @@ -247,11 +250,13 @@ void * pmap_mapdev(vm_offset_t pa, vm_size_t size) { vm_offset_t va, tmpva, offset; +#if 0 void * rva; /* First look in the static mapping table. */ if ((rva = arm_devmap_ptov(pa, size)) != NULL) return (rva); +#endif offset = pa & PAGE_MASK; pa = trunc_page(pa); @@ -280,9 +285,11 @@ pmap_unmapdev(vm_offset_t va, vm_size_t vm_offset_t tmpva, offset; vm_size_t origsize; +#if 0 /* Nothing to do if we find the mapping in the static table. */ if (arm_devmap_vtop((void*)va, size) != DEVMAP_PADDR_NOTFOUND) return; +#endif origsize = size; offset = va & PAGE_MASK; @@ -298,6 +305,7 @@ pmap_unmapdev(vm_offset_t va, vm_size_t kva_free(va, origsize); } +#if 0 #ifdef DDB #include @@ -307,4 +315,5 @@ DB_SHOW_COMMAND(devmap, db_show_devmap) } #endif /* DDB */ +#endif Modified: projects/arm64/sys/conf/files.arm64 ============================================================================== --- projects/arm64/sys/conf/files.arm64 Thu Jul 31 13:02:56 2014 (r269331) +++ projects/arm64/sys/conf/files.arm64 Thu Jul 31 14:47:26 2014 (r269332) @@ -1,4 +1,5 @@ +arm/arm/devmap.c standard arm64/arm64/autoconf.c standard arm64/arm64/bcopy.c standard arm64/arm64/bus_machdep.c standard