diff options
| author |   Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2023-08-07 13:29:40 +0300 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2023-08-07 13:29:40 +0300 |
| commit | 9f771739a04919226081a107167596de75108fbb (patch) | |
| tree | fd64841d76f3408ed5d25f4d9aaa5088a752e2fd /lib/xarray.c | |
| parent | drm/i915/guc/slpc: Restore efficient freq earlier (diff) | |
| parent | Merge tag 'drm-intel-gt-next-2023-08-04' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (diff) | |
| download | wireguard-linux-9f771739a04919226081a107167596de75108fbb.tar.xz wireguard-linux-9f771739a04919226081a107167596de75108fbb.zip | |
Merge drm/drm-next into drm-intel-gt-next
Need to pull in b3e4aae612ec ("drm/i915/hdcp: Modify hdcp_gsc_message msg sending mechanism") as
a dependency for https://patchwork.freedesktop.org/series/121735/
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'lib/xarray.c')
| -rw-r--r-- | lib/xarray.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/xarray.c b/lib/xarray.c index ea9ce1f0b386..2071a3718f4e 100644 --- a/lib/xarray.c +++ b/lib/xarray.c @@ -12,6 +12,8 @@ #include <linux/slab.h> #include <linux/xarray.h> +#include "radix-tree.h" + /* * Coding conventions in this file: * @@ -247,10 +249,6 @@ void *xas_load(struct xa_state *xas) } EXPORT_SYMBOL_GPL(xas_load); -/* Move the radix tree node cache here */ -extern struct kmem_cache *radix_tree_node_cachep; -extern void radix_tree_node_rcu_free(struct rcu_head *head); - #define XA_RCU_FREE ((struct xarray *)1) static void xa_node_free(struct xa_node *node) |