diff options
| author | Juergen Werner <juergen@opensourcerouting.org> | 2019-10-01 15:23:55 +0200 |
|---|---|---|
| committer | Juergen Werner <juergen@opensourcerouting.org> | 2019-10-01 15:25:18 +0200 |
| commit | a72a3fa6373af2729abc7c2c27fb57c9393718f2 (patch) | |
| tree | c38c5d89a52875e2a597d1b7734cde41fa3c31d4 /lib/frrcu.c | |
| parent | 4d8ebeddc56f49aa0b4d7cec506cab14320e1bb4 (diff) | |
lib: Revert "lib: Stop arm crash on shutdown"
This reverts commit 11375c52740089b6b49ca7d56b2cea0c7208338c.
That commit was introduced to fix a CI failure, which should now not
accure due to the preceding commit/revert.
Signed-off-by: Juergen Werner <juergen@opensourcerouting.org>
Diffstat (limited to 'lib/frrcu.c')
| -rw-r--r-- | lib/frrcu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/frrcu.c b/lib/frrcu.c index 54626f909d..7e6475b648 100644 --- a/lib/frrcu.c +++ b/lib/frrcu.c @@ -55,6 +55,7 @@ #include "atomlist.h" DEFINE_MTYPE_STATIC(LIB, RCU_THREAD, "RCU thread") +DEFINE_MTYPE_STATIC(LIB, RCU_NEXT, "RCU sequence barrier") DECLARE_ATOMLIST(rcu_heads, struct rcu_head, head) @@ -225,7 +226,7 @@ static void rcu_bump(void) { struct rcu_next *rn; - rn = XMALLOC(MTYPE_RCU_THREAD, sizeof(*rn)); + rn = XMALLOC(MTYPE_RCU_NEXT, sizeof(*rn)); /* note: each RCUA_NEXT item corresponds to exactly one seqno bump. * This means we don't need to communicate which seqno is which @@ -268,7 +269,7 @@ static void rcu_bump(void) * "last item is being deleted - start over" case, and then we may end * up accessing old RCU queue items that are already free'd. */ - rcu_free_internal(MTYPE_RCU_THREAD, rn, head_free); + rcu_free_internal(MTYPE_RCU_NEXT, rn, head_free); /* Only allow the RCU sweeper to run after these 2 items are queued. * |