]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #4497 from opensourcerouting/rcu
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 8 Aug 2019 12:41:07 +0000 (08:41 -0400)
committerGitHub <noreply@github.com>
Thu, 8 Aug 2019 12:41:07 +0000 (08:41 -0400)
RCU support

1  2 
lib/log.c
lib/subdir.am
lib/thread.c

diff --cc lib/log.c
Simple merge
diff --cc lib/subdir.am
Simple merge
diff --cc lib/thread.c
index f862ce5eb0697ac2f44bd2019ddd879bc6c6c9ff,0436f31c3de6615d9be7af7e090ea6c08132949e..5756ebc1f99920b0eaaa02fab8ad48689e8b303c
  
  #include "thread.h"
  #include "memory.h"
+ #include "frrcu.h"
  #include "log.h"
  #include "hash.h"
 -#include "pqueue.h"
  #include "command.h"
  #include "sigevent.h"
  #include "network.h"