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/i386 | |
| parent | af0cdb69df549f230a3fb994f6fbf59996bf290d (diff) | |
Define and use IPL_MPFLOOR in our common mutex implementation.
ok kettenis@, visa@
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/include/intrdefs.h | 3 | ||||
| -rw-r--r-- | sys/arch/i386/include/mutex.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/i386/include/intrdefs.h b/sys/arch/i386/include/intrdefs.h index fba06ef79e9..c95b7890396 100644 --- a/sys/arch/i386/include/intrdefs.h +++ b/sys/arch/i386/include/intrdefs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intrdefs.h,v 1.15 2016/10/21 06:20:58 mlarkin Exp $ */ +/* $OpenBSD: intrdefs.h,v 1.16 2018/01/13 15:18:11 mpi Exp $ */ /* $NetBSD: intrdefs.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $ */ #ifndef _I386_INTRDEFS_H @@ -70,6 +70,7 @@ #define IPL_HIGH MAKEIPL(10) /* everything */ #define IPL_IPI MAKEIPL(11) /* interprocessor interrupt */ +#define IPL_MPFLOOR IPL_TTY #define IPL_MPSAFE 0x100 /* Interrupt sharing types. */ diff --git a/sys/arch/i386/include/mutex.h b/sys/arch/i386/include/mutex.h index 96db30e8ad6..d3525fc2eff 100644 --- a/sys/arch/i386/include/mutex.h +++ b/sys/arch/i386/include/mutex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.h,v 1.11 2018/01/12 09:19:33 mpi Exp $ */ +/* $OpenBSD: mutex.h,v 1.12 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_TTY) ? IPL_TTY : (ipl)) + (((ipl) > IPL_NONE && (ipl) < IPL_MPFLOOR) ? IPL_MPFLOOR : (ipl)) #else #define __MUTEX_IPL(ipl) (ipl) #endif |