From e0f1c0afa46cc84d4b1e40124032a9a87310386e Mon Sep 17 00:00:00 2001 From: Olaf Faaland Date: Thu, 28 Mar 2019 20:30:57 +0000 Subject: 10499 Multi-modifier protection (MMP) Portions contributed by: Jerry Jelinek Portions contributed by: Tim Chase Portions contributed by: sanjeevbagewadi Portions contributed by: John L. Hammond Portions contributed by: Giuseppe Di Natale Portions contributed by: Prakash Surya Reviewed by: George Melikov Reviewed by: Tom Caputi Reviewed by: Kash Pande Reviewed by: loli10K Reviewed by: George Melikov Reviewed by: Tony Hutter Reviewed by: Gu Zheng Reviewed by: Matthew Ahrens Reviewed by: Ned Bass Reviewed by: Andreas Dilger Reviewed by: Brian Behlendorf Reviewed by: Andy Stormont Reviewed by: Toomas Soome Reviewed by: Kody Kantor Approved by: Dan McDonald --- usr/src/lib/libfakekernel/common/cond.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'usr/src/lib/libfakekernel/common/cond.c') diff --git a/usr/src/lib/libfakekernel/common/cond.c b/usr/src/lib/libfakekernel/common/cond.c index 08d0265dd2..859722cb27 100644 --- a/usr/src/lib/libfakekernel/common/cond.c +++ b/usr/src/lib/libfakekernel/common/cond.c @@ -12,6 +12,7 @@ /* * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright 2017 RackTop Systems. + * Copyright 2019 Joyent, Inc. */ /* @@ -119,6 +120,15 @@ cv_timedwait_sig(kcondvar_t *cv, kmutex_t *mp, clock_t abstime) return (cv__twait(cv, mp, delta, 1, 0)); } +int +cv_timedwait_sig_hrtime(kcondvar_t *cv, kmutex_t *mp, hrtime_t tim) +{ + clock_t delta; + + delta = tim; + return (cv__twait(cv, mp, delta, 1, 1)); +} + /*ARGSUSED*/ clock_t cv_timedwait_hires(kcondvar_t *cv, kmutex_t *mp, hrtime_t tim, hrtime_t res, -- cgit v1.2.3