From owner-svn-src-all@FreeBSD.ORG Wed Feb 11 22:34:50 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 689B51065670; Wed, 11 Feb 2009 22:34:50 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 569DC8FC23; Wed, 11 Feb 2009 22:34:50 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1BMYo1A038119; Wed, 11 Feb 2009 22:34:50 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1BMYoT4038118; Wed, 11 Feb 2009 22:34:50 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200902112234.n1BMYoT4038118@svn.freebsd.org> From: Sam Leffler Date: Wed, 11 Feb 2009 22:34:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188505 - head/sys/arm/xscale/ixp425 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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, 11 Feb 2009 22:34:52 -0000 Author: sam Date: Wed Feb 11 22:34:50 2009 New Revision: 188505 URL: http://svn.freebsd.org/changeset/base/188505 Log: fix ARM_USE_SMALL_ALLOC after memory layout changes Submitted by: cognet Modified: head/sys/arm/xscale/ixp425/avila_machdep.c Modified: head/sys/arm/xscale/ixp425/avila_machdep.c ============================================================================== --- head/sys/arm/xscale/ixp425/avila_machdep.c Wed Feb 11 22:34:22 2009 (r188504) +++ head/sys/arm/xscale/ixp425/avila_machdep.c Wed Feb 11 22:34:50 2009 (r188505) @@ -334,17 +334,20 @@ initarm(void *arg, void *arg2) alloc_pages(minidataclean.pv_pa, 1); valloc_pages(msgbufpv, round_page(MSGBUF_SIZE) / PAGE_SIZE); #ifdef ARM_USE_SMALL_ALLOC -#error "I am broken" /* XXX save people grief */ freemempos -= PAGE_SIZE; freemem_pt = trunc_page(freemem_pt); - freemem_after = freemempos - ((freemem_pt - 0x10100000) / + freemem_after = freemempos - ((freemem_pt - (PHYSADDR + 0x100000)) / PAGE_SIZE) * sizeof(struct arm_small_page); - arm_add_smallalloc_pages((void *)(freemem_after + (KERNVIRTADDR - KERNPHYSADDR) - , (void *)0xc0100000, freemem_pt - 0x10100000, 1); - freemem_after -= ((freemem_after - 0x10001000) / PAGE_SIZE) * + arm_add_smallalloc_pages( + (void *)(freemem_after + (KERNVIRTADDR - KERNPHYSADDR)), + (void *)0xc0100000, + freemem_pt - (PHYSADDR + 0x100000), 1); + freemem_after -= ((freemem_after - (PHYSADDR + 0x1000)) / PAGE_SIZE) * sizeof(struct arm_small_page); - arm_add_smallalloc_pages((void *)(freemem_after + (KEYVIRTADDR - KERNPHYSADDR)) - , (void *)0xc0001000, trunc_page(freemem_after) - 0x10001000, 0); + arm_add_smallalloc_pages( + (void *)(freemem_after + (KERNVIRTADDR - KERNPHYSADDR)), + (void *)0xc0001000, + trunc_page(freemem_after) - (PHYSADDR + 0x1000), 0); freemempos = trunc_page(freemem_after); freemempos -= PAGE_SIZE; #endif