diff options
| -rw-r--r-- | fs/bcachefs/Makefile | 1 | ||||
| -rw-r--r-- | fs/bcachefs/btree_key_cache_types.h | 2 | ||||
| -rw-r--r-- | include/linux/rcu_pending.h (renamed from fs/bcachefs/rcu_pending.h) | 0 | ||||
| -rw-r--r-- | kernel/rcu/Makefile | 2 | ||||
| -rw-r--r-- | kernel/rcu/pending.c (renamed from fs/bcachefs/rcu_pending.c) | 3 |
5 files changed, 3 insertions, 5 deletions
diff --git a/fs/bcachefs/Makefile b/fs/bcachefs/Makefile index 17e7dd13ab0e..3d477690b71e 100644 --- a/fs/bcachefs/Makefile +++ b/fs/bcachefs/Makefile @@ -68,7 +68,6 @@ bcachefs-y := \ printbuf.o \ quota.o \ rebalance.o \ - rcu_pending.o \ recovery.o \ recovery_passes.o \ reflink.o \ diff --git a/fs/bcachefs/btree_key_cache_types.h b/fs/bcachefs/btree_key_cache_types.h index 722f1ed10551..739f97022d81 100644 --- a/fs/bcachefs/btree_key_cache_types.h +++ b/fs/bcachefs/btree_key_cache_types.h @@ -2,7 +2,7 @@ #ifndef _BCACHEFS_BTREE_KEY_CACHE_TYPES_H #define _BCACHEFS_BTREE_KEY_CACHE_TYPES_H -#include "rcu_pending.h" +#include <linux/rcu_pending.h> struct btree_key_cache { struct rhashtable table; diff --git a/fs/bcachefs/rcu_pending.h b/include/linux/rcu_pending.h index a875c640da8d..a875c640da8d 100644 --- a/fs/bcachefs/rcu_pending.h +++ b/include/linux/rcu_pending.h diff --git a/kernel/rcu/Makefile b/kernel/rcu/Makefile index 0cfb009a99b9..2582f0324a11 100644 --- a/kernel/rcu/Makefile +++ b/kernel/rcu/Makefile @@ -7,7 +7,7 @@ ifeq ($(CONFIG_KCSAN),y) KBUILD_CFLAGS += -g -fno-omit-frame-pointer endif -obj-y += update.o sync.o +obj-y += update.o sync.o pending.o obj-$(CONFIG_TREE_SRCU) += srcutree.o obj-$(CONFIG_TINY_SRCU) += srcutiny.o obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o diff --git a/fs/bcachefs/rcu_pending.c b/kernel/rcu/pending.c index 1ffec2d8b014..0e814bfd1c87 100644 --- a/fs/bcachefs/rcu_pending.c +++ b/kernel/rcu/pending.c @@ -5,12 +5,11 @@ #include <linux/generic-radix-tree.h> #include <linux/mm.h> #include <linux/percpu.h> +#include <linux/rcu_pending.h> #include <linux/slab.h> #include <linux/srcu.h> #include <linux/vmalloc.h> -#include "rcu_pending.h" - #define static_array_for_each(_a, _i) \ for (typeof(&(_a)[0]) _i = _a; \ _i < (_a) + ARRAY_SIZE(_a); \ |