From owner-svn-src-user@FreeBSD.ORG Tue Aug 14 17:53:52 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A58011065672; Tue, 14 Aug 2012 17:53:52 +0000 (UTC) (envelope-from jceel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 90F5E8FC0C; Tue, 14 Aug 2012 17:53:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7EHrqt4029931; Tue, 14 Aug 2012 17:53:52 GMT (envelope-from jceel@svn.freebsd.org) Received: (from jceel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7EHrql6029929; Tue, 14 Aug 2012 17:53:52 GMT (envelope-from jceel@svn.freebsd.org) Message-Id: <201208141753.q7EHrql6029929@svn.freebsd.org> From: Jakub Wojciech Klama Date: Tue, 14 Aug 2012 17:53:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239256 - user/jceel/soc2012_armv6/sys/arm/arm X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Aug 2012 17:53:52 -0000 Author: jceel Date: Tue Aug 14 17:53:52 2012 New Revision: 239256 URL: http://svn.freebsd.org/changeset/base/239256 Log: Mark arm_pmap_devmap as weak reference, to allow it being NULL on ports which not use new machdep infrastructure. Fix one debug printf. Modified: user/jceel/soc2012_armv6/sys/arm/arm/machdep.c Modified: user/jceel/soc2012_armv6/sys/arm/arm/machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/arm/machdep.c Tue Aug 14 17:01:21 2012 (r239255) +++ user/jceel/soc2012_armv6/sys/arm/arm/machdep.c Tue Aug 14 17:53:52 2012 (r239256) @@ -120,8 +120,6 @@ extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; extern u_int undefined_handler_address; -extern vm_offset_t pmap_bootstrap_lastaddr; - struct pv_addr systempage; struct pv_addr msgbufpv; struct pv_addr irqstack; @@ -129,7 +127,7 @@ struct pv_addr undstack; struct pv_addr abtstack; struct pv_addr kernelstack; -extern struct pmap_devmap arm_pmap_devmap[]; +extern struct pmap_devmap arm_pmap_devmap[] __attribute__((weak)); struct pv_addr arm_bootstrap_l2pt[128]; vm_offset_t arm_free_va, arm_free_pa, arm_allocated_va; vm_offset_t arm_start_va, arm_start_pa; @@ -980,7 +978,7 @@ arm_mmu_init(uint32_t memsize, uint32_t arm_allocated_va = arm_free_va - arm_start_va; pmap_bootstrap_lastaddr = ARM_DEVMAP_START - ARM_NOCACHE_KVA_SIZE; - edebugf("arm_free_va=0x%x arm_free_pa=0x%x\n", arm_start_va, arm_free_va); + edebugf("arm_start_va=0x%x arm_free_va=0x%x\n", arm_start_va, arm_free_va); edebugf("using %s vectors address\n", high_vectors ? "high" : "low"); /*