svn commit: r331931 - in head/sys: amd64/amd64 i386/i386 x86/x86

[Andriy Gapon]

Author: avg
Date: Tue Apr  3 17:16:06 2018
New Revision: 331931
URL: https://svnweb.freebsd.org/changeset/base/331931

Log:
  fix i386 build with CPU_ELAN (LINT for instance) after r331878
  
  x86/cpu_machdep.c now needs to include elan_mmcr.h when CPU_ELAN is set.
  While here, also remove the now unneeded inclusion of isareg.h in i386
  and amd64 vm_machdep.c.
  
  Reported by:	lwhsu
  MFC after:	14 days
  X-MFC with:	r331878

Modified:
  head/sys/amd64/amd64/vm_machdep.c
  head/sys/i386/i386/vm_machdep.c
  head/sys/x86/x86/cpu_machdep.c

Modified: head/sys/amd64/amd64/vm_machdep.c
==============================================================================
--- head/sys/amd64/amd64/vm_machdep.c	Tue Apr  3 15:14:30 2018	(r331930)
+++ head/sys/amd64/amd64/vm_machdep.c	Tue Apr  3 17:16:06 2018	(r331931)
@@ -82,8 +82,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 #include <vm/vm_param.h>
 
-#include <isa/isareg.h>
-
 _Static_assert(OFFSETOF_CURTHREAD == offsetof(struct pcpu, pc_curthread),
     "OFFSETOF_CURTHREAD does not correspond with offset of pc_curthread.");
 _Static_assert(OFFSETOF_CURPCB == offsetof(struct pcpu, pc_curpcb),

Modified: head/sys/i386/i386/vm_machdep.c
==============================================================================
--- head/sys/i386/i386/vm_machdep.c	Tue Apr  3 15:14:30 2018	(r331930)
+++ head/sys/i386/i386/vm_machdep.c	Tue Apr  3 17:16:06 2018	(r331931)
@@ -79,18 +79,12 @@ __FBSDID("$FreeBSD$");
 #include <machine/smp.h>
 #include <machine/vm86.h>
 
-#ifdef CPU_ELAN
-#include <machine/elan_mmcr.h>
-#endif
-
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 #include <vm/vm_param.h>
-
-#include <isa/isareg.h>
 
 #ifndef NSFBUFS
 #define	NSFBUFS		(512 + maxusers * 16)

Modified: head/sys/x86/x86/cpu_machdep.c
==============================================================================
--- head/sys/x86/x86/cpu_machdep.c	Tue Apr  3 15:14:30 2018	(r331930)
+++ head/sys/x86/x86/cpu_machdep.c	Tue Apr  3 17:16:06 2018	(r331931)
@@ -85,6 +85,9 @@ __FBSDID("$FreeBSD$");
 #ifdef SMP
 #include <machine/smp.h>
 #endif
+#ifdef CPU_ELAN
+#include <machine/elan_mmcr.h>
+#endif
 #include <x86/acpica_machdep.h>
 
 #include <vm/vm.h>