From owner-svn-src-head@freebsd.org  Tue Apr 26 12:29:48 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 BA3FEB1CFC5;
 Tue, 26 Apr 2016 12:29:48 +0000 (UTC) (envelope-from br@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 8CB971380;
 Tue, 26 Apr 2016 12:29:48 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3QCTlR3087190;
 Tue, 26 Apr 2016 12:29:47 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3QCTlir087189;
 Tue, 26 Apr 2016 12:29:47 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201604261229.u3QCTlir087189@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Tue, 26 Apr 2016 12:29:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298631 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Apr 2016 12:29:48 -0000

Author: br
Date: Tue Apr 26 12:29:47 2016
New Revision: 298631
URL: https://svnweb.freebsd.org/changeset/base/298631

Log:
  Add support for RISC-V.

Modified:
  head/sys/kern/subr_devmap.c

Modified: head/sys/kern/subr_devmap.c
==============================================================================
--- head/sys/kern/subr_devmap.c	Tue Apr 26 12:02:36 2016	(r298630)
+++ head/sys/kern/subr_devmap.c	Tue Apr 26 12:29:47 2016	(r298631)
@@ -56,7 +56,7 @@ static struct devmap_entry	akva_devmap_e
 static u_int			akva_devmap_idx;
 static vm_offset_t		akva_devmap_vaddr = DEVMAP_MAX_VADDR;
 
-#ifdef __aarch64__
+#if defined(__aarch64__) || defined(__riscv__)
 extern int early_boot;
 #endif
 
@@ -200,7 +200,7 @@ devmap_bootstrap(vm_offset_t l1pt, const
 		pmap_map_chunk(l1pt, pd->pd_va, pd->pd_pa, pd->pd_size,
 		    VM_PROT_READ | VM_PROT_WRITE, PTE_DEVICE);
 #endif
-#elif defined(__aarch64__)
+#elif defined(__aarch64__) || defined(__riscv__)
 		pmap_kenter_device(pd->pd_va, pd->pd_size, pd->pd_pa);
 #endif
 	}
@@ -273,7 +273,7 @@ pmap_mapdev(vm_offset_t pa, vm_size_t si
 	pa = trunc_page(pa);
 	size = round_page(size + offset);
 
-#ifdef __aarch64__
+#if defined(__aarch64__) || defined(__riscv__)
 	if (early_boot) {
 		akva_devmap_vaddr = trunc_page(akva_devmap_vaddr - size);
 		va = akva_devmap_vaddr;