d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix i386 build with CPU_ELAN (LINT for instance) after r331878

Browse Source 
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
This commit is contained in:
Andriy Gapon 2018-04-03 17:16:06 +00:00
parent 4b9dc36454
commit 3da25bdb02
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/amd64/amd64/vm_machdep.c
View File

@ -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),

6
sys/i386/i386/vm_machdep.c
View File

@ -79,10 +79,6 @@ __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>
@ -90,8 +86,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_map.h>
#include <vm/vm_param.h>
#include <isa/isareg.h>
#ifndef NSFBUFS
#define NSFBUFS (512 + maxusers * 16)
#endif

3
sys/x86/x86/cpu_machdep.c
View File

@ -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>