From owner-svn-src-all@freebsd.org Mon Oct 14 19:06:18 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C48041345AF; Mon, 14 Oct 2019 19:06:18 +0000 (UTC) (envelope-from luporl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46sShV4nBvz3GDJ; Mon, 14 Oct 2019 19:06:18 +0000 (UTC) (envelope-from luporl@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 82C8E9B05; Mon, 14 Oct 2019 19:06:18 +0000 (UTC) (envelope-from luporl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9EJ6ISn023570; Mon, 14 Oct 2019 19:06:18 GMT (envelope-from luporl@FreeBSD.org) Received: (from luporl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9EJ6Ins023569; Mon, 14 Oct 2019 19:06:18 GMT (envelope-from luporl@FreeBSD.org) Message-Id: <201910141906.x9EJ6Ins023569@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: luporl set sender to luporl@FreeBSD.org using -f From: Leandro Lupori Date: Mon, 14 Oct 2019 19:06:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353500 - in head/sys/powerpc: aim powerpc X-SVN-Group: head X-SVN-Commit-Author: luporl X-SVN-Commit-Paths: in head/sys/powerpc: aim powerpc X-SVN-Commit-Revision: 353500 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 14 Oct 2019 19:06:18 -0000 Author: luporl Date: Mon Oct 14 19:06:17 2019 New Revision: 353500 URL: https://svnweb.freebsd.org/changeset/base/353500 Log: Fix powerpc/powerpcspe builds Revision 353489 introduced some new function calls in common powerpc code, but these must be called only on powerpc64. Modified: head/sys/powerpc/aim/mmu_oea64.c head/sys/powerpc/powerpc/uma_machdep.c Modified: head/sys/powerpc/aim/mmu_oea64.c ============================================================================== --- head/sys/powerpc/aim/mmu_oea64.c Mon Oct 14 18:31:11 2019 (r353499) +++ head/sys/powerpc/aim/mmu_oea64.c Mon Oct 14 19:06:17 2019 (r353500) @@ -2943,6 +2943,8 @@ moea64_scan_init(mmu_t mmu) } } +#ifdef __powerpc64__ + static size_t moea64_scan_pmap(mmu_t mmu) { @@ -3009,3 +3011,19 @@ moea64_dump_pmap_init(mmu_t mmu, unsigned blkpgs) dump_ctx.blksz = blkpgs * PAGE_SIZE; return (&dump_ctx); } + +#else + +static size_t +moea64_scan_pmap(mmu_t mmu) +{ + return (0); +} + +static void * +moea64_dump_pmap_init(mmu_t mmu, unsigned blkpgs) +{ + return (NULL); +} + +#endif Modified: head/sys/powerpc/powerpc/uma_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/uma_machdep.c Mon Oct 14 18:31:11 2019 (r353499) +++ head/sys/powerpc/powerpc/uma_machdep.c Mon Oct 14 19:06:17 2019 (r353500) @@ -71,8 +71,10 @@ uma_small_alloc(uma_zone_t zone, vm_size_t bytes, int if ((vm_offset_t)pa != pa) return (NULL); +#ifdef __powerpc64__ if ((wait & M_NODUMP) == 0) dump_add_page(pa); +#endif if (!hw_direct_map) { pmap_kenter(pa, pa); @@ -103,7 +105,9 @@ uma_small_free(void *mem, vm_size_t size, u_int8_t fla m = PHYS_TO_VM_PAGE((vm_offset_t)mem); KASSERT(m != NULL, ("Freeing UMA block at %p with no associated page", mem)); - dump_add_page(VM_PAGE_TO_PHYS(m)); +#ifdef __powerpc64__ + dump_drop_page(VM_PAGE_TO_PHYS(m)); +#endif vm_page_unwire_noq(m); vm_page_free(m); atomic_subtract_int(&hw_uma_mdpages, 1);