proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 08:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Revert "lib: Stop arm crash on shutdown"

Browse Source 
This reverts commit 11375c5274.

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>
This commit is contained in:
Juergen Werner 2019-10-01 15:23:55 +02:00
parent 4d8ebeddc5
commit a72a3fa637
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/frrcu.c
View File

@ -55,6 +55,7 @@
#include "atomlist.h" #include "atomlist.h"
DEFINE_MTYPE_STATIC(LIB, RCU_THREAD, "RCU thread") 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) DECLARE_ATOMLIST(rcu_heads, struct rcu_head, head)
@ -225,7 +226,7 @@ static void rcu_bump(void)
{ {
struct rcu_next *rn; 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. /* note: each RCUA_NEXT item corresponds to exactly one seqno bump.
* This means we don't need to communicate which seqno is which * 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 * "last item is being deleted - start over" case, and then we may end
* up accessing old RCU queue items that are already free'd. * 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. /* Only allow the RCU sweeper to run after these 2 items are queued.
* *