From 317043010879767bc6a3bef6cbec0c5f300d1ce0 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Mon, 19 Oct 2020 13:54:31 +0300 Subject: sys: update to 6.8 --- sys/sys/srp.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'sys/sys/srp.h') diff --git a/sys/sys/srp.h b/sys/sys/srp.h index a22e940..c2f40ab 100644 --- a/sys/sys/srp.h +++ b/sys/sys/srp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: srp.h,v 1.14 2019/03/31 14:03:40 mpi Exp $ */ +/* $OpenBSD: srp.h,v 1.15 2020/05/09 10:18:27 jca Exp $ */ /* * Copyright (c) 2014 Jonathan Matthew @@ -96,11 +96,18 @@ void *srp_enter(struct srp_ref *, struct srp *); void *srp_follow(struct srp_ref *, struct srp *); void srp_leave(struct srp_ref *); #else /* MULTIPROCESSOR */ + +static inline void * +srp_enter(struct srp_ref *sr, struct srp *srp) +{ + sr->hz = NULL; + return srp->ref; +} + #define srp_swap(_srp, _v) srp_swap_locked((_srp), (_v)) #define srp_update(_gc, _srp, _v) srp_update_locked((_gc), (_srp), (_v)) #define srp_finalize(_v, _wchan) ((void)0) -#define srp_enter(_sr, _srp) ((_srp)->ref) -#define srp_follow(_sr, _srp) ((_srp)->ref) +#define srp_follow(_sr, _srp) srp_enter(_sr, _srp) #define srp_leave(_sr) do { } while (0) #endif /* MULTIPROCESSOR */ -- cgit v1.2.3