From owner-svn-src-projects@FreeBSD.ORG Wed Jul 29 21:47:39 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67BB3106564A; Wed, 29 Jul 2009 21:47:39 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3BA4E8FC0A; Wed, 29 Jul 2009 21:47:39 +0000 (UTC) (envelope-from nwhitehorn@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 n6TLldpR083253; Wed, 29 Jul 2009 21:47:39 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6TLld7B083250; Wed, 29 Jul 2009 21:47:39 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200907292147.n6TLld7B083250@svn.freebsd.org> From: Nathan Whitehorn Date: Wed, 29 Jul 2009 21:47:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195953 - in projects/ppc64/sys/powerpc: aim aim64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 29 Jul 2009 21:47:39 -0000 Author: nwhitehorn Date: Wed Jul 29 21:47:38 2009 New Revision: 195953 URL: http://svn.freebsd.org/changeset/base/195953 Log: Fix 32-bit build. Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/ofw_machdep.c Wed Jul 29 21:36:40 2009 (r195952) +++ projects/ppc64/sys/powerpc/aim/ofw_machdep.c Wed Jul 29 21:47:38 2009 (r195953) @@ -182,13 +182,17 @@ parse_ofw_memory(phandle_t node, const c output[j].mr_start = OFmem[i++]; if (address_cells == 2) { + #ifdef __powerpc64__ output[j].mr_start <<= 32; + #endif output[j].mr_start += OFmem[i++]; } output[j].mr_size = OFmem[i++]; if (size_cells == 2) { + #ifdef __powerpc64__ output[j].mr_size <<= 32; + #endif output[j].mr_size += OFmem[i++]; } @@ -200,7 +204,7 @@ parse_ofw_memory(phandle_t node, const c if (((uint64_t)output[j].mr_start + (uint64_t)output[j].mr_size) > BUS_SPACE_MAXADDR_32BIT) { - ouptut[j].mr_size = BUS_SPACE_MAXADDR_32BIT - + output[j].mr_size = BUS_SPACE_MAXADDR_32BIT - output[j].mr_start; } #endif Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Wed Jul 29 21:36:40 2009 (r195952) +++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Wed Jul 29 21:47:38 2009 (r195953) @@ -388,7 +388,9 @@ static void moea64_kremove(mmu_t, vm_of static void moea64_syncicache(pmap_t pmap, vm_offset_t va, vm_offset_t pa); static void tlbia(void); +#ifdef __powerpc64__ static void slbia(void); +#endif /* * Kernel MMU interface @@ -750,7 +752,7 @@ moea64_bridge_cpu_bootstrap(mmu_t mmup, } #else for (i = 0; i < NSEGS; i++) - mtsrin(i << ADDR_SR_SHFT, pmap->pm_sr[i]); + mtsrin(i << ADDR_SR_SHFT, kernel_pmap->pm_sr[i]); #endif /* @@ -2070,11 +2072,13 @@ tlbia(void) TLBIE(NULL,i); } +#ifdef __powerpc64__ static void slbia(void) { __asm __volatile ("slbia"); } +#endif static int moea64_pvo_enter(pmap_t pm, uma_zone_t zone, struct pvo_head *pvo_head,