Moved the definitions of AST_PENDING and AST_RESCHED to the correct place.
This commit is contained in:
parent
e6c89c1bd2
commit
9a25c23635
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=67011
@ -55,7 +55,6 @@
|
||||
#ifdef KTR_PERCPU
|
||||
#include <sys/ktr.h>
|
||||
#endif
|
||||
#include <machine/frame.h>
|
||||
#include <machine/bootinfo.h>
|
||||
#include <machine/tss.h>
|
||||
#include <sys/vmmeter.h>
|
||||
@ -73,7 +72,7 @@
|
||||
#ifdef SMP
|
||||
#include <machine/apic.h>
|
||||
#endif
|
||||
#include <machine/segments.h>
|
||||
#include <machine/cpu.h>
|
||||
#include <machine/sigframe.h>
|
||||
#include <machine/globaldata.h>
|
||||
#include <machine/vm86.h>
|
||||
@ -182,6 +181,8 @@ ASSYM(GD_SWITCHTICKS, offsetof(struct globaldata, gd_switchticks));
|
||||
ASSYM(GD_COMMON_TSSD, offsetof(struct globaldata, gd_common_tssd));
|
||||
ASSYM(GD_TSS_GDT, offsetof(struct globaldata, gd_tss_gdt));
|
||||
ASSYM(GD_ASTPENDING, offsetof(struct globaldata, gd_astpending));
|
||||
ASSYM(AST_PENDING, AST_PENDING);
|
||||
ASSYM(AST_RESCHED, AST_RESCHED);
|
||||
ASSYM(GD_INTR_NESTING_LEVEL, offsetof(struct globaldata, gd_intr_nesting_level));
|
||||
|
||||
#ifdef USER_LDT
|
||||
|
@ -64,6 +64,12 @@
|
||||
#define CLKF_INTR(framep) (intr_nesting_level >= 2)
|
||||
#define CLKF_PC(framep) ((framep)->cf_eip)
|
||||
|
||||
/*
|
||||
* astpending bits
|
||||
*/
|
||||
#define AST_PENDING 0x00000001
|
||||
#define AST_RESCHED 0x00000002
|
||||
|
||||
/*
|
||||
* Preempt the current process if in interrupt from user mode,
|
||||
* or after the current trap/syscall if in system mode.
|
||||
|
@ -55,7 +55,6 @@
|
||||
#ifdef KTR_PERCPU
|
||||
#include <sys/ktr.h>
|
||||
#endif
|
||||
#include <machine/frame.h>
|
||||
#include <machine/bootinfo.h>
|
||||
#include <machine/tss.h>
|
||||
#include <sys/vmmeter.h>
|
||||
@ -73,7 +72,7 @@
|
||||
#ifdef SMP
|
||||
#include <machine/apic.h>
|
||||
#endif
|
||||
#include <machine/segments.h>
|
||||
#include <machine/cpu.h>
|
||||
#include <machine/sigframe.h>
|
||||
#include <machine/globaldata.h>
|
||||
#include <machine/vm86.h>
|
||||
@ -182,6 +181,8 @@ ASSYM(GD_SWITCHTICKS, offsetof(struct globaldata, gd_switchticks));
|
||||
ASSYM(GD_COMMON_TSSD, offsetof(struct globaldata, gd_common_tssd));
|
||||
ASSYM(GD_TSS_GDT, offsetof(struct globaldata, gd_tss_gdt));
|
||||
ASSYM(GD_ASTPENDING, offsetof(struct globaldata, gd_astpending));
|
||||
ASSYM(AST_PENDING, AST_PENDING);
|
||||
ASSYM(AST_RESCHED, AST_RESCHED);
|
||||
ASSYM(GD_INTR_NESTING_LEVEL, offsetof(struct globaldata, gd_intr_nesting_level));
|
||||
|
||||
#ifdef USER_LDT
|
||||
|
@ -64,6 +64,12 @@
|
||||
#define CLKF_INTR(framep) (intr_nesting_level >= 2)
|
||||
#define CLKF_PC(framep) ((framep)->cf_eip)
|
||||
|
||||
/*
|
||||
* astpending bits
|
||||
*/
|
||||
#define AST_PENDING 0x00000001
|
||||
#define AST_RESCHED 0x00000002
|
||||
|
||||
/*
|
||||
* Preempt the current process if in interrupt from user mode,
|
||||
* or after the current trap/syscall if in system mode.
|
||||
|
@ -44,10 +44,4 @@
|
||||
|
||||
#define NSWI 7
|
||||
|
||||
/*
|
||||
* astpending bits
|
||||
*/
|
||||
#define AST_PENDING 0x00000001
|
||||
#define AST_RESCHED 0x00000002
|
||||
|
||||
#endif /* !_MACHINE_IPL_H_ */
|
||||
|
Loading…
Reference in New Issue
Block a user