Catch up to i386 interrupt and SMP code changes.
This commit is contained in:
parent
147ad8d5ad
commit
bfba3d5ed3
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=121997
@ -39,6 +39,7 @@
|
|||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__FBSDID("$FreeBSD$");
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
|
#include "opt_apic.h"
|
||||||
#include "opt_compat.h"
|
#include "opt_compat.h"
|
||||||
#include "opt_kstack_pages.h"
|
#include "opt_kstack_pages.h"
|
||||||
|
|
||||||
@ -70,8 +71,8 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include <nfs/rpcv2.h>
|
#include <nfs/rpcv2.h>
|
||||||
#include <nfsclient/nfs.h>
|
#include <nfsclient/nfs.h>
|
||||||
#include <nfsclient/nfsdiskless.h>
|
#include <nfsclient/nfsdiskless.h>
|
||||||
#ifdef SMP
|
#ifdef DEV_APIC
|
||||||
#include <machine/apic.h>
|
#include <machine/apicreg.h>
|
||||||
#endif
|
#endif
|
||||||
#include <machine/cpu.h>
|
#include <machine/cpu.h>
|
||||||
#include <machine/sigframe.h>
|
#include <machine/sigframe.h>
|
||||||
@ -178,6 +179,7 @@ ASSYM(UC_GS, offsetof(ucontext_t, uc_mcontext.mc_gs));
|
|||||||
ASSYM(ENOENT, ENOENT);
|
ASSYM(ENOENT, ENOENT);
|
||||||
ASSYM(EFAULT, EFAULT);
|
ASSYM(EFAULT, EFAULT);
|
||||||
ASSYM(ENAMETOOLONG, ENAMETOOLONG);
|
ASSYM(ENAMETOOLONG, ENAMETOOLONG);
|
||||||
|
ASSYM(MAXCOMLEN, MAXCOMLEN);
|
||||||
ASSYM(MAXPATHLEN, MAXPATHLEN);
|
ASSYM(MAXPATHLEN, MAXPATHLEN);
|
||||||
ASSYM(BOOTINFO_SIZE, sizeof(struct bootinfo));
|
ASSYM(BOOTINFO_SIZE, sizeof(struct bootinfo));
|
||||||
ASSYM(BI_VERSION, offsetof(struct bootinfo, bi_version));
|
ASSYM(BI_VERSION, offsetof(struct bootinfo, bi_version));
|
||||||
@ -192,10 +194,6 @@ ASSYM(BI_KERNEND, offsetof(struct bootinfo, bi_kernend));
|
|||||||
ASSYM(PC_SIZEOF, sizeof(struct pcpu));
|
ASSYM(PC_SIZEOF, sizeof(struct pcpu));
|
||||||
ASSYM(PC_PRVSPACE, offsetof(struct pcpu, pc_prvspace));
|
ASSYM(PC_PRVSPACE, offsetof(struct pcpu, pc_prvspace));
|
||||||
ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread));
|
ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread));
|
||||||
ASSYM(PC_INT_PENDING, offsetof(struct pcpu, pc_int_pending));
|
|
||||||
ASSYM(PC_IPENDING, offsetof(struct pcpu, pc_ipending));
|
|
||||||
ASSYM(PC_FPENDING, offsetof(struct pcpu, pc_fpending));
|
|
||||||
ASSYM(PC_SPENDING, offsetof(struct pcpu, pc_spending));
|
|
||||||
ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread));
|
ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread));
|
||||||
ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread));
|
ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread));
|
||||||
ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb));
|
ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb));
|
||||||
@ -206,13 +204,14 @@ ASSYM(PC_CURRENTLDT, offsetof(struct pcpu, pc_currentldt));
|
|||||||
ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid));
|
ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid));
|
||||||
ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap));
|
ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap));
|
||||||
|
|
||||||
#ifdef SMP
|
#ifdef DEV_APIC
|
||||||
ASSYM(LA_VER, offsetof(struct LAPIC, version));
|
ASSYM(LA_VER, offsetof(struct LAPIC, version));
|
||||||
ASSYM(LA_TPR, offsetof(struct LAPIC, tpr));
|
ASSYM(LA_TPR, offsetof(struct LAPIC, tpr));
|
||||||
ASSYM(LA_EOI, offsetof(struct LAPIC, eoi));
|
ASSYM(LA_EOI, offsetof(struct LAPIC, eoi));
|
||||||
ASSYM(LA_SVR, offsetof(struct LAPIC, svr));
|
ASSYM(LA_SVR, offsetof(struct LAPIC, svr));
|
||||||
ASSYM(LA_ICR_LO, offsetof(struct LAPIC, icr_lo));
|
ASSYM(LA_ICR_LO, offsetof(struct LAPIC, icr_lo));
|
||||||
ASSYM(LA_ICR_HI, offsetof(struct LAPIC, icr_hi));
|
ASSYM(LA_ICR_HI, offsetof(struct LAPIC, icr_hi));
|
||||||
|
ASSYM(LA_ISR, offsetof(struct LAPIC, isr0));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ASSYM(KCSEL, GSEL(GCODE_SEL, SEL_KPL));
|
ASSYM(KCSEL, GSEL(GCODE_SEL, SEL_KPL));
|
||||||
|
Loading…
Reference in New Issue
Block a user