From owner-svn-src-head@freebsd.org Thu Jan 18 11:21:05 2018 Return-Path: Delivered-To: svn-src-head@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 771DCEC66A7; Thu, 18 Jan 2018 11:21:05 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 25AB063354; Thu, 18 Jan 2018 11:21:05 +0000 (UTC) (envelope-from kib@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 53A741DC38; Thu, 18 Jan 2018 11:21:04 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0IBL4dY047040; Thu, 18 Jan 2018 11:21:04 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0IBL3M4047038; Thu, 18 Jan 2018 11:21:03 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201801181121.w0IBL3M4047038@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 18 Jan 2018 11:21:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328120 - in head/sys/amd64: amd64 include X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head/sys/amd64: amd64 include X-SVN-Commit-Revision: 328120 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jan 2018 11:21:05 -0000 Author: kib Date: Thu Jan 18 11:21:03 2018 New Revision: 328120 URL: https://svnweb.freebsd.org/changeset/base/328120 Log: Fix compilation with gcc. etext is already declared in machine/cpu.h, move kernphys declaration there too. Based on the patch by: bde MFC after: 13 days Modified: head/sys/amd64/amd64/pmap.c head/sys/amd64/include/cpu.h Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Thu Jan 18 11:19:58 2018 (r328119) +++ head/sys/amd64/amd64/pmap.c Thu Jan 18 11:21:03 2018 (r328120) @@ -7562,8 +7562,6 @@ pmap_pti_free_page(vm_page_t m) return (true); } -extern char kernphys[], etext[]; - static void pmap_pti_init(void) { Modified: head/sys/amd64/include/cpu.h ============================================================================== --- head/sys/amd64/include/cpu.h Thu Jan 18 11:19:58 2018 (r328119) +++ head/sys/amd64/include/cpu.h Thu Jan 18 11:21:03 2018 (r328120) @@ -70,6 +70,7 @@ struct cpu_ops { extern struct cpu_ops cpu_ops; extern char btext[]; extern char etext[]; +extern char kernphys[]; /* Resume hook for VMM. */ extern void (*vmm_resume_p)(void);