diff options
| author | Takuya ASADA <syuu@cvs.openbsd.org> | 2009-10-07 08:35:48 +0000 |
|---|---|---|
| committer | Takuya ASADA <syuu@cvs.openbsd.org> | 2009-10-07 08:35:48 +0000 |
| commit | 3aa5f4e167455894dc0c933fd98e931557b55d01 (patch) | |
| tree | db648cf06d696194491882713128ededc7d54f36 /sys/arch/mips64/include | |
| parent | f263e2ad6e36282018fa401e143f1bdd612a62ed (diff) | |
ipending, cpl moved into cpu_info
OK miod@
Diffstat (limited to 'sys/arch/mips64/include')
| -rw-r--r-- | sys/arch/mips64/include/cpu.h | 4 | ||||
| -rw-r--r-- | sys/arch/mips64/include/cpustate.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h index a74da48580f..119c34483f7 100644 --- a/sys/arch/mips64/include/cpu.h +++ b/sys/arch/mips64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.37 2009/09/30 06:22:00 syuu Exp $ */ +/* $OpenBSD: cpu.h,v 1.38 2009/10/07 08:35:47 syuu Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -374,6 +374,8 @@ struct cpu_info { int ci_want_resched; /* need_resched() invoked */ cpuid_t ci_cpuid; /* our CPU ID */ u_int32_t ci_randseed; /* per cpu random seed */ + intrmask_t ci_cpl; + intrmask_t ci_ipending; #ifdef MULTIPROCESSOR u_long ci_flags; /* flags; see below */ #endif diff --git a/sys/arch/mips64/include/cpustate.h b/sys/arch/mips64/include/cpustate.h index 3172938a733..7512fdbf9c5 100644 --- a/sys/arch/mips64/include/cpustate.h +++ b/sys/arch/mips64/include/cpustate.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpustate.h,v 1.6 2004/10/20 12:49:15 pefo Exp $ */ +/* $OpenBSD: cpustate.h,v 1.7 2009/10/07 08:35:47 syuu Exp $ */ /* * Copyright (c) 2002-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -79,7 +79,8 @@ SAVE_REG(a3, PC, frame, bo) ;\ SAVE_REG(sp, SP, frame, bo) ;\ PTR_ADDU a0, frame, bo ;\ - lw a2, cpl ;\ + GET_CPU_INFO(v0, v1) ;\ + lw a2, CI_CPL(v0) ;\ SAVE_REG(a2, CPL, frame, bo) /* |