Commit dd841a74 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

radix tree test suite: Fix compilation 



Introducing local_lock broke compilation; fix it all up.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
parent 856deb86

include/linux/radix-tree.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/bitops.h>

#include <linux/kernel.h>

#include <linux/list.h>

#include <linux/percpu.h>

#include <linux/preempt.h>

#include <linux/rcupdate.h>

#include <linux/spinlock.h>

lib/radix-tree.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/kernel.h>

#include <linux/kmemleak.h>

#include <linux/percpu.h>

#include <linux/local_lock.h>

#include <linux/preempt.h>		/* in_interrupt() */

#include <linux/radix-tree.h>

#include <linux/rcupdate.h>

tools/testing/radix-tree/linux/kernel.h

+1 −0
Original line number Diff line number Diff line
@@ -22,4 +22,5 @@ 
#define __releases(x)

#define __must_hold(x)



#define EXPORT_PER_CPU_SYMBOL_GPL(x)

#endif /* _KERNEL_H */

tools/testing/radix-tree/linux/local_lock.h

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_LOCAL_LOCK

#define _LINUX_LOCAL_LOCK

typedef struct { } local_lock_t;



static inline void local_lock(local_lock_t *lock) { }

static inline void local_unlock(local_lock_t *lock) { }

#define INIT_LOCAL_LOCK(x) { }

#endif

tools/testing/radix-tree/test.h

+0 −4
Original line number Diff line number Diff line
@@ -56,8 +56,4 @@ int root_tag_get(struct radix_tree_root *root, unsigned int tag); 
unsigned long node_maxindex(struct radix_tree_node *);

unsigned long shift_maxindex(unsigned int shift);

int radix_tree_cpu_dead(unsigned int cpu);

struct radix_tree_preload {

	unsigned nr;

	struct radix_tree_node *nodes;

};

extern struct radix_tree_preload radix_tree_preloads;