diff options
Diffstat (limited to 'sys/amd64/include')
| -rw-r--r-- | sys/amd64/include/cpufunc.h | 2 | ||||
| -rw-r--r-- | sys/amd64/include/mptable.h | 6 | ||||
| -rw-r--r-- | sys/amd64/include/pcb.h | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index b3ced94..94d5c3a 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -52,7 +52,7 @@ __BEGIN_DECLS #define writew(va, d) (*(volatile u_int16_t *) (va) = (d)) #define writel(va, d) (*(volatile u_int32_t *) (va) = (d)) -#define MACHINE_CRITICAL_ENTER /* MD code defines critical_enter/exit/fork */ +#define CRITICAL_FORK (read_eflags() | PSL_I) #ifdef __GNUC__ diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h index 76f0d1b..008dfc5 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/include/mptable.h @@ -2480,9 +2480,6 @@ ap_init(void) /* * For statclock, we send an IPI to all CPU's to have them call this * function. - * - * WARNING! unpend() will call statclock_process() directly and skip this - * routine. */ void forwarded_statclock(struct trapframe frame) @@ -2515,9 +2512,6 @@ forward_statclock(void) * sched_lock if we could simply peek at the CPU to determine the user/kernel * state and call hardclock_process() on the CPU receiving the clock interrupt * and then just use a simple IPI to handle any ast's if needed. - * - * WARNING! unpend() will call hardclock_process() directly and skip this - * routine. */ void forwarded_hardclock(struct trapframe frame) diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h index 9a1f338..d4a375a 100644 --- a/sys/amd64/include/pcb.h +++ b/sys/amd64/include/pcb.h @@ -69,8 +69,7 @@ struct pcb { caddr_t pcb_onfault; /* copyin/out fault recovery */ int pcb_gs; struct pcb_ext *pcb_ext; /* optional pcb extension */ - int pcb_psl; /* process status long */ - u_long __pcb_spare[2]; /* adjust to avoid core dump size changes */ + u_long __pcb_spare[3]; /* adjust to avoid core dump size changes */ }; /* |
