aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOlivier Houchard <cognet@FreeBSD.org>2018-08-09 12:07:37 +0000
committerOlivier Houchard <cognet@FreeBSD.org>2018-08-09 12:07:37 +0000
commit449aa8c6415a21a51841ebb8de79339701bcc295 (patch)
tree1e48ac6c52e0a3c63f3d583b396f24003b5f4d88 /src
parent5ffae39d54df91940d3092ab3c2d890574a8d52d (diff)
downloadsrc-449aa8c6415a21a51841ebb8de79339701bcc295.tar.gz
src-449aa8c6415a21a51841ebb8de79339701bcc295.zip
Import CK as of commit 08813496570879fbcc2adcdd9ddc0a054361bfde, mostlyvendor/ck/20180809
to avoid using lwsync on ppc32.
Notes
Notes: svn path=/vendor-sys/ck/dist/; revision=337531 svn path=/vendor-sys/ck/20180809/; revision=337532; tag=vendor/ck/20180809
Diffstat (limited to 'src')
-rw-r--r--src/ck_barrier_combining.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ck_barrier_combining.c b/src/ck_barrier_combining.c
index 3ee72fdb086f..ed1960c0ed97 100644
--- a/src/ck_barrier_combining.c
+++ b/src/ck_barrier_combining.c
@@ -35,7 +35,7 @@ struct ck_barrier_combining_queue {
struct ck_barrier_combining_group *tail;
};
-CK_CC_INLINE static struct ck_barrier_combining_group *
+static struct ck_barrier_combining_group *
ck_barrier_combining_queue_dequeue(struct ck_barrier_combining_queue *queue)
{
struct ck_barrier_combining_group *front = NULL;
@@ -48,7 +48,7 @@ ck_barrier_combining_queue_dequeue(struct ck_barrier_combining_queue *queue)
return front;
}
-CK_CC_INLINE static void
+static void
ck_barrier_combining_insert(struct ck_barrier_combining_group *parent,
struct ck_barrier_combining_group *tnode,
struct ck_barrier_combining_group **child)
@@ -72,7 +72,7 @@ ck_barrier_combining_insert(struct ck_barrier_combining_group *parent,
* into the barrier's tree. We use a queue to implement this
* traversal.
*/
-CK_CC_INLINE static void
+static void
ck_barrier_combining_queue_enqueue(struct ck_barrier_combining_queue *queue,
struct ck_barrier_combining_group *node_value)
{
@@ -185,10 +185,10 @@ ck_barrier_combining_aux(struct ck_barrier_combining *barrier,
ck_pr_fence_store();
ck_pr_store_uint(&tnode->sense, ~tnode->sense);
} else {
- ck_pr_fence_memory();
while (sense != ck_pr_load_uint(&tnode->sense))
ck_pr_stall();
}
+ ck_pr_fence_memory();
return;
}