From owner-svn-src-all@freebsd.org Thu Jan 18 15:15:36 2018 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 76553E7FD22; Thu, 18 Jan 2018 15:15:36 +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 52CC372811; Thu, 18 Jan 2018 15:15:36 +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 9B92D203DA; Thu, 18 Jan 2018 15:15:35 +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 w0IFFZPN048884; Thu, 18 Jan 2018 15:15:35 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0IFFZ9U048881; Thu, 18 Jan 2018 15:15:35 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201801181515.w0IFFZ9U048881@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 15:15:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328128 - 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: 328128 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.25 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: Thu, 18 Jan 2018 15:15:36 -0000 Author: kib Date: Thu Jan 18 15:15:35 2018 New Revision: 328128 URL: https://svnweb.freebsd.org/changeset/base/328128 Log: Move the kernphys declaration to machine/md_var.h. Apparently machinde/cpu.h is supposed to contain MD implementations of MI interfaces. Also, remove kernphys declaration from machdep.c, since it is already provided by md_var.h. Requested and reviewed by: bde MFC after: 13 days Modified: head/sys/amd64/amd64/machdep.c head/sys/amd64/include/cpu.h head/sys/amd64/include/md_var.h Modified: head/sys/amd64/amd64/machdep.c ============================================================================== --- head/sys/amd64/amd64/machdep.c Thu Jan 18 13:43:09 2018 (r328127) +++ head/sys/amd64/amd64/machdep.c Thu Jan 18 15:15:35 2018 (r328128) @@ -188,12 +188,6 @@ struct init_ops init_ops = { }; /* - * The file "conf/ldscript.amd64" defines the symbol "kernphys". Its value is - * the physical address at which the kernel is loaded. - */ -extern char kernphys[]; - -/* * Physical address of the EFI System Table. Stashed from the metadata hints * passed into the kernel and used by the EFI code to call runtime services. */ Modified: head/sys/amd64/include/cpu.h ============================================================================== --- head/sys/amd64/include/cpu.h Thu Jan 18 13:43:09 2018 (r328127) +++ head/sys/amd64/include/cpu.h Thu Jan 18 15:15:35 2018 (r328128) @@ -70,7 +70,6 @@ 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); Modified: head/sys/amd64/include/md_var.h ============================================================================== --- head/sys/amd64/include/md_var.h Thu Jan 18 13:43:09 2018 (r328127) +++ head/sys/amd64/include/md_var.h Thu Jan 18 15:15:35 2018 (r328128) @@ -39,6 +39,12 @@ extern uint64_t *vm_page_dump; extern int hw_lower_amd64_sharedpage; +/* + * The file "conf/ldscript.amd64" defines the symbol "kernphys". Its + * value is the physical address at which the kernel is loaded. + */ +extern char kernphys[]; + struct savefpu; struct sysentvec;