diff options
| author |   visa <visa@openbsd.org> | 2017-05-18 01:27:49 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2017-05-18 01:27:49 +0000 |
| commit | af9839d3b107e2a466f376fc43fd5677a32dcab5 (patch) | |
| tree | 392f5d23b0a374f35a762a230a199f153b0d6c7d | |
| parent | Delete the -T xhtml command line option. (diff) | |
| download | wireguard-openbsd-af9839d3b107e2a466f376fc43fd5677a32dcab5.tar.xz wireguard-openbsd-af9839d3b107e2a466f376fc43fd5677a32dcab5.zip | |
Fix kernel build on armv7 and sh.
Pointed out by deraadt@
| -rw-r--r-- | sys/arch/arm/armv7/armv7_mutex.c | 4 | ||||
| -rw-r--r-- | sys/arch/arm/include/mutex.h | 4 | ||||
| -rw-r--r-- | sys/arch/sh/include/mutex.h | 4 | ||||
| -rw-r--r-- | sys/arch/sh/sh/mutex.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/arm/armv7/armv7_mutex.c b/sys/arch/arm/armv7/armv7_mutex.c index 8b138116783..8edc76a0d3e 100644 --- a/sys/arch/arm/armv7/armv7_mutex.c +++ b/sys/arch/arm/armv7/armv7_mutex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: armv7_mutex.c,v 1.3 2017/04/20 13:57:29 visa Exp $ */ +/* $OpenBSD: armv7_mutex.c,v 1.4 2017/05/18 01:27:49 visa Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -43,7 +43,7 @@ * raising semantics of the mutexes. */ void -__mtx_init(struct mutex *mtx, int wantipl) +_mtx_init(struct mutex *mtx, int wantipl) { mtx->mtx_oldipl = 0; mtx->mtx_wantipl = wantipl; diff --git a/sys/arch/arm/include/mutex.h b/sys/arch/arm/include/mutex.h index a2e26718ef8..1125f8ed569 100644 --- a/sys/arch/arm/include/mutex.h +++ b/sys/arch/arm/include/mutex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.h,v 1.3 2017/04/20 13:57:29 visa Exp $ */ +/* $OpenBSD: mutex.h,v 1.4 2017/05/18 01:27:49 visa Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -42,7 +42,7 @@ struct mutex { #endif }; -void __mtx_init(struct mutex *, int); +void _mtx_init(struct mutex *, int); #ifdef WITNESS #define MUTEX_INITIALIZER_FLAGS(ipl, name, flags) \ diff --git a/sys/arch/sh/include/mutex.h b/sys/arch/sh/include/mutex.h index 87c82d2b5d4..461a462049f 100644 --- a/sys/arch/sh/include/mutex.h +++ b/sys/arch/sh/include/mutex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.h,v 1.3 2017/04/20 13:57:30 visa Exp $ */ +/* $OpenBSD: mutex.h,v 1.4 2017/05/18 01:27:49 visa Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -37,7 +37,7 @@ struct mutex { int mtx_oldipl; }; -void __mtx_init(struct mutex *, int); +void _mtx_init(struct mutex *, int); #define MUTEX_INITIALIZER_FLAGS(ipl, name, flags) \ { 0, (ipl) << 4, 0 } diff --git a/sys/arch/sh/sh/mutex.c b/sys/arch/sh/sh/mutex.c index 3f8cf57f4fd..a73f35af59b 100644 --- a/sys/arch/sh/sh/mutex.c +++ b/sys/arch/sh/sh/mutex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.c,v 1.8 2017/04/20 13:57:30 visa Exp $ */ +/* $OpenBSD: mutex.c,v 1.9 2017/05/18 01:27:49 visa Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -40,7 +40,7 @@ * raising semantics of the mutexes. */ void -__mtx_init(struct mutex *mtx, int wantipl) +_mtx_init(struct mutex *mtx, int wantipl) { mtx->mtx_oldipl = 0; mtx->mtx_wantipl = wantipl << 4; |