diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2018-01-13 15:18:12 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2018-01-13 15:18:12 +0000 |
| commit | 5e38460a283b5e53bdcbf4b00933915a75bf00f7 (patch) | |
| tree | 79aa3b5c8b0406750ace928f81748cd69fcc0d7c /sys/arch/alpha | |
| parent | af0cdb69df549f230a3fb994f6fbf59996bf290d (diff) | |
Define and use IPL_MPFLOOR in our common mutex implementation.
ok kettenis@, visa@
Diffstat (limited to 'sys/arch/alpha')
| -rw-r--r-- | sys/arch/alpha/include/intr.h | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/include/mutex.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h index 1934f691984..4f7ab8356c6 100644 --- a/sys/arch/alpha/include/intr.h +++ b/sys/arch/alpha/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.46 2016/06/13 01:26:14 dlg Exp $ */ +/* $OpenBSD: intr.h,v 1.47 2018/01/13 15:18:11 mpi Exp $ */ /* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */ /*- @@ -125,6 +125,8 @@ struct scbvec { #define IPL_SOFTNET 2 /* network software interrupts */ #define IPL_SOFT 3 /* other software interrupts */ +#define IPL_MPFLOOR IPL_AUDIO + #define IPL_MPSAFE 0 /* no "mpsafe" interrupts */ #define IST_UNUSABLE -1 /* interrupt cannot be used */ diff --git a/sys/arch/alpha/include/mutex.h b/sys/arch/alpha/include/mutex.h index 720a30baba2..20078d4b7f7 100644 --- a/sys/arch/alpha/include/mutex.h +++ b/sys/arch/alpha/include/mutex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.h,v 1.9 2018/01/04 11:03:48 mpi Exp $ */ +/* $OpenBSD: mutex.h,v 1.10 2018/01/13 15:18:11 mpi Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -48,7 +48,7 @@ struct mutex { */ #ifdef MULTIPROCESSOR #define __MUTEX_IPL(ipl) \ - (((ipl) > IPL_NONE && (ipl) < IPL_AUDIO) ? IPL_AUDIO : (ipl)) + (((ipl) > IPL_NONE && (ipl) < IPL_MPFLOOR) ? IPL_MPFLOOR : (ipl)) #else #define __MUTEX_IPL(ipl) (ipl) #endif |