diff options
Diffstat (limited to 'sys/arch/mips64/include')
| -rw-r--r-- | sys/arch/mips64/include/asm.h | 7 | ||||
| -rw-r--r-- | sys/arch/mips64/include/cpu.h | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/sys/arch/mips64/include/asm.h b/sys/arch/mips64/include/asm.h index c8c2b368a41..5b97ab7848c 100644 --- a/sys/arch/mips64/include/asm.h +++ b/sys/arch/mips64/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.11 2010/04/28 16:20:28 syuu Exp $ */ +/* $OpenBSD: asm.h,v 1.12 2010/09/11 11:29:49 syuu Exp $ */ /* * Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -298,10 +298,7 @@ x: ; \ dsll reg, reg, 59 #ifdef MULTIPROCESSOR -#define GET_CPU_INFO(ci, tmp) \ - LOAD_XKPHYS(ci, CCA_CACHED); \ - mfc0 tmp, COP_0_LLADDR; \ - or ci, ci, tmp +#define GET_CPU_INFO(ci, tmp) HW_GET_CPU_INFO(ci, tmp) #else /* MULTIPROCESSOR */ #define GET_CPU_INFO(ci, tmp) \ LA ci, cpu_info_primary diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h index 692aed0c0da..fc3d17a015e 100644 --- a/sys/arch/mips64/include/cpu.h +++ b/sys/arch/mips64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.59 2010/08/30 08:52:10 syuu Exp $ */ +/* $OpenBSD: cpu.h,v 1.60 2010/09/11 11:29:49 syuu Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -434,8 +434,8 @@ extern struct cpu_info *cpu_info_list; #ifdef MULTIPROCESSOR #define MAXCPUS 4 -extern struct cpu_info *getcurcpu(void); -extern void setcurcpu(struct cpu_info *); +#define getcurcpu() hw_getcurcpu() +#define setcurcpu(ci) hw_setcurcpu(ci) extern struct cpu_info *get_cpu_info(int); #define curcpu() getcurcpu() #define CPU_IS_PRIMARY(ci) ((ci)->ci_flags & CPUF_PRIMARY) |