git: 74e9b5f29ad0 - main - Merge commit 'ce929fe84f9c453263af379f3b255ff8eca01d48'
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 29 Oct 2021 17:27:54 UTC
The branch main has been updated by cognet:
URL: https://cgit.FreeBSD.org/src/commit/?id=74e9b5f29ad0056bbe11a30c91dfa0705fa19cd5
commit 74e9b5f29ad0056bbe11a30c91dfa0705fa19cd5
Merge: ad0379660d0c ce929fe84f9c
Author: Olivier Houchard <cognet@FreeBSD.org>
AuthorDate: 2021-10-29 17:18:03 +0000
Commit: Olivier Houchard <cognet@FreeBSD.org>
CommitDate: 2021-10-29 17:18:03 +0000
Merge commit 'ce929fe84f9c453263af379f3b255ff8eca01d48'
Import CK as of commit 2265c7846f4ce667f5216456afe2779b23c3e5f7.
sys/contrib/ck/include/ck_backoff.h | 2 +-
sys/contrib/ck/include/ck_cc.h | 2 +
sys/contrib/ck/include/ck_ec.h | 945 ++++++++++++++++++++++++
sys/contrib/ck/include/ck_fifo.h | 2 +-
sys/contrib/ck/include/ck_hs.h | 8 +
sys/contrib/ck/include/ck_pr.h | 15 +-
sys/contrib/ck/include/ck_queue.h | 20 +-
sys/contrib/ck/include/ck_ring.h | 672 +++++++++++++----
sys/contrib/ck/include/gcc/aarch64/ck_pr.h | 12 +-
sys/contrib/ck/include/gcc/aarch64/ck_pr_llsc.h | 106 +--
sys/contrib/ck/include/gcc/aarch64/ck_pr_lse.h | 37 +-
sys/contrib/ck/include/gcc/ck_cc.h | 9 +
sys/contrib/ck/include/gcc/x86/ck_pr.h | 109 +--
sys/contrib/ck/include/gcc/x86_64/ck_pr.h | 87 ++-
sys/contrib/ck/include/spinlock/fas.h | 9 +-
sys/contrib/ck/src/ck_ec.c | 425 +++++++++++
sys/contrib/ck/src/ck_ec_timeutil.h | 150 ++++
sys/contrib/ck/src/ck_hs.c | 7 +-
sys/contrib/ck/src/ck_ht.c | 3 -
19 files changed, 2272 insertions(+), 348 deletions(-)
diff --cc sys/contrib/ck/include/ck_ec.h
index 000000000000,cd2a36813a79..cd2a36813a79
mode 000000,100644..100644
--- a/sys/contrib/ck/include/ck_ec.h
+++ b/sys/contrib/ck/include/ck_ec.h
diff --cc sys/contrib/ck/src/ck_ec.c
index 000000000000,9b24e762947c..9b24e762947c
mode 000000,100644..100644
--- a/sys/contrib/ck/src/ck_ec.c
+++ b/sys/contrib/ck/src/ck_ec.c
diff --cc sys/contrib/ck/src/ck_ec_timeutil.h
index 000000000000,50cfb67bf4a4..50cfb67bf4a4
mode 000000,100644..100644
--- a/sys/contrib/ck/src/ck_ec_timeutil.h
+++ b/sys/contrib/ck/src/ck_ec_timeutil.h