diff options
Diffstat (limited to 'sys/i386/include')
| -rw-r--r-- | sys/i386/include/cpu.h | 2 | ||||
| -rw-r--r-- | sys/i386/include/globaldata.h | 2 | ||||
| -rw-r--r-- | sys/i386/include/mptable.h | 4 | ||||
| -rw-r--r-- | sys/i386/include/pcpu.h | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h index 6c4162b..87c47c5 100644 --- a/sys/i386/include/cpu.h +++ b/sys/i386/include/cpu.h @@ -62,7 +62,7 @@ #define CLKF_USERMODE(framep) \ ((ISPL((framep)->cf_cs) == SEL_UPL) || (framep->cf_eflags & PSL_VM)) -#define CLKF_INTR(framep) (PCPU_GET(intr_nesting_level) >= 2) +#define CLKF_INTR(framep) (curproc->p_intr_nesting_level >= 2) #define CLKF_PC(framep) ((framep)->cf_eip) /* diff --git a/sys/i386/include/globaldata.h b/sys/i386/include/globaldata.h index 149026e..7a7437a6 100644 --- a/sys/i386/include/globaldata.h +++ b/sys/i386/include/globaldata.h @@ -58,8 +58,6 @@ struct globaldata { struct timeval gd_switchtime; struct i386tss gd_common_tss; int gd_switchticks; - u_char gd_intr_nesting_level; - u_char gd_pad0[3]; struct segment_descriptor gd_common_tssd; struct segment_descriptor *gd_tss_gdt; int gd_currentldt; /* only used for USER_LDT */ diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h index bf560cd..966d3f8 100644 --- a/sys/i386/include/mptable.h +++ b/sys/i386/include/mptable.h @@ -581,10 +581,12 @@ mp_enable(u_int boot_addr) /* install an inter-CPU IPI for forcing an additional software trap */ setidt(XCPUAST_OFFSET, Xcpuast, SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - + +#if 0 /* install an inter-CPU IPI for interrupt forwarding */ setidt(XFORWARD_IRQ_OFFSET, Xforward_irq, SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); +#endif /* install an inter-CPU IPI for CPU stop/restart */ setidt(XCPUSTOP_OFFSET, Xcpustop, diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h index 149026e..7a7437a6 100644 --- a/sys/i386/include/pcpu.h +++ b/sys/i386/include/pcpu.h @@ -58,8 +58,6 @@ struct globaldata { struct timeval gd_switchtime; struct i386tss gd_common_tss; int gd_switchticks; - u_char gd_intr_nesting_level; - u_char gd_pad0[3]; struct segment_descriptor gd_common_tssd; struct segment_descriptor *gd_tss_gdt; int gd_currentldt; /* only used for USER_LDT */ |
