projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into urcu/rcuja-range-merge
[userspace-rcu.git]
/
rculfhash.c
diff --git
a/rculfhash.c
b/rculfhash.c
index 57f1a04d46dd3d446ca88fa74267660dd7a26fe2..4c6c970236fba8516fd3db73ec69fc1e2f9460a7 100644
(file)
--- a/
rculfhash.c
+++ b/
rculfhash.c
@@
-426,7
+426,7
@@
unsigned int fls_u32(uint32_t x)
{
int r;
{
int r;
-
asm
("bsrl %1,%0\n\t"
+
__asm__
("bsrl %1,%0\n\t"
"jnz 1f\n\t"
"movl $-1,%0\n\t"
"1:\n\t"
"jnz 1f\n\t"
"movl $-1,%0\n\t"
"1:\n\t"
@@
-442,7
+442,7
@@
unsigned int fls_u64(uint64_t x)
{
long r;
{
long r;
-
asm
("bsrq %1,%0\n\t"
+
__asm__
("bsrq %1,%0\n\t"
"jnz 1f\n\t"
"movq $-1,%0\n\t"
"1:\n\t"
"jnz 1f\n\t"
"movq $-1,%0\n\t"
"1:\n\t"
@@
-2050,3
+2050,8
@@
void cds_lfht_resize_lazy_count(struct cds_lfht *ht, unsigned long size,
}
__cds_lfht_resize_lazy_launch(ht);
}
}
__cds_lfht_resize_lazy_launch(ht);
}
+
+const struct rcu_flavor_struct *cds_lfht_rcu_flavor(struct cds_lfht *ht)
+{
+ return ht->flavor;
+}
This page took
0.026206 seconds
and
4
git commands to generate.