diff options
Diffstat (limited to 'sys/arch/amd64/include/cpu.h')
| -rw-r--r-- | sys/arch/amd64/include/cpu.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h index ff9507bff77..8c92ab3498d 100644 --- a/sys/arch/amd64/include/cpu.h +++ b/sys/arch/amd64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.41 2009/02/16 15:50:05 jsg Exp $ */ +/* $OpenBSD: cpu.h,v 1.42 2009/04/23 07:42:02 art Exp $ */ /* $NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $ */ /*- @@ -69,8 +69,6 @@ struct cpu_info { struct simplelock ci_slock; u_int ci_cpuid; u_int ci_apicid; - u_long ci_spin_locks; - u_long ci_simple_locks; u_int32_t ci_randseed; u_int64_t ci_scratch; @@ -78,12 +76,12 @@ struct cpu_info { struct proc *ci_fpcurproc; int ci_fpsaving; - volatile u_int32_t ci_tlb_ipi_mask; - struct pcb *ci_curpcb; struct pcb *ci_idle_pcb; int ci_idle_tss_sel; + struct pmap *ci_curpmap; + struct intrsource *ci_isources[MAX_INTR_SOURCES]; u_int32_t ci_ipending; int ci_ilevel; @@ -91,7 +89,6 @@ struct cpu_info { u_int32_t ci_imask[NIPL]; u_int32_t ci_iunmask[NIPL]; - paddr_t ci_idle_pcb_paddr; u_int ci_flags; u_int32_t ci_ipis; @@ -110,11 +107,6 @@ struct cpu_info { struct x86_cache_info ci_cinfo[CAI_COUNT]; - struct timeval ci_cc_time; - int64_t ci_cc_cc; - int64_t ci_cc_ms_delta; - int64_t ci_cc_denom; - char *ci_gdt; volatile int ci_ddb_paused; |