From owner-svn-src-all@freebsd.org Fri Nov 18 22:59:34 2016 Return-Path: Delivered-To: svn-src-all@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 78532C48FED; Fri, 18 Nov 2016 22:59:34 +0000 (UTC) (envelope-from jhibbits@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 485F5DEF; Fri, 18 Nov 2016 22:59:34 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAIMxXf6028620; Fri, 18 Nov 2016 22:59:33 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAIMxXbh028619; Fri, 18 Nov 2016 22:59:33 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201611182259.uAIMxXbh028619@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Fri, 18 Nov 2016 22:59:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r308817 - head/sys/powerpc/include X-SVN-Group: head 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.23 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: Fri, 18 Nov 2016 22:59:34 -0000 Author: jhibbits Date: Fri Nov 18 22:59:33 2016 New Revision: 308817 URL: https://svnweb.freebsd.org/changeset/base/308817 Log: Fix buildworld Change the pv_tracked flag to an int, just in case userspace decides to include this file and defines BOOKE. Guard this block from unintentional inclusion with ifdef BOOKE. Reported by: emaste Modified: head/sys/powerpc/include/pmap.h Modified: head/sys/powerpc/include/pmap.h ============================================================================== --- head/sys/powerpc/include/pmap.h Fri Nov 18 22:58:47 2016 (r308816) +++ head/sys/powerpc/include/pmap.h Fri Nov 18 22:59:33 2016 (r308817) @@ -179,7 +179,7 @@ void slb_free_tree(pmap_t pm); struct slb **slb_alloc_user_cache(void); void slb_free_user_cache(struct slb **); -#else +#elif defined(BOOKE) struct pmap { struct mtx pm_mtx; /* pmap mutex */ @@ -204,7 +204,7 @@ typedef struct pv_entry *pv_entry_t; struct md_page { TAILQ_HEAD(, pv_entry) pv_list; - bool pv_tracked; + int pv_tracked; }; #define pmap_page_get_memattr(m) VM_MEMATTR_DEFAULT