diff options
Diffstat (limited to 'sys/arch/sgi')
| -rw-r--r-- | sys/arch/sgi/include/cpu.h | 16 | ||||
| -rw-r--r-- | sys/arch/sgi/include/intr.h | 3 |
2 files changed, 16 insertions, 3 deletions
diff --git a/sys/arch/sgi/include/cpu.h b/sys/arch/sgi/include/cpu.h index 2c56835ee63..b8740d1af54 100644 --- a/sys/arch/sgi/include/cpu.h +++ b/sys/arch/sgi/include/cpu.h @@ -1,6 +1,18 @@ -/* $OpenBSD: cpu.h,v 1.1 2004/08/06 21:12:18 pefo Exp $ */ +/* $OpenBSD: cpu.h,v 1.2 2009/09/15 04:54:31 syuu Exp $ */ /* Use Mips generic include file */ -#include <mips64/cpu.h> +#ifdef _KERNEL +#ifdef MULTIPROCESSOR +#if defined(TGT_OCTANE) +#define HW_CPU_NUMBER 0x900000000ff50000/* HEART_PRID */ +#else +#error MULTIPROCESSOR kernel not supported on this configuration +#endif +#define hw_cpu_number() (*(uint64_t *)HW_CPU_NUMBER) +#else/* MULTIPROCESSOR */ +#define hw_cpu_number() 0 +#endif/* MULTIPROCESSOR */ +#endif/* _KERNEL */ +#include <mips64/cpu.h> diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h index d8fb60d9d93..e8e0c6a549e 100644 --- a/sys/arch/sgi/include/intr.h +++ b/sys/arch/sgi/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.27 2009/08/22 02:54:51 mk Exp $ */ +/* $OpenBSD: intr.h,v 1.28 2009/09/15 04:54:31 syuu Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -134,6 +134,7 @@ extern struct soft_intrhand *softnet_intrhand; SINTMASK(SI_SOFT)) #define splstatclock() splhigh() #define splsched() splhigh() +#define spllock() splhigh() #define splhigh() splraise(-1) #define spl0() spllower(0) |