Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 18 Jan 2018 15:15:35 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
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
Message-ID:  <201801181515.w0IFFZ9U048881@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801181515.w0IFFZ9U048881>