Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

radix tree test suite: Fix compilation

Introducing local_lock broke compilation; fix it all up.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

+10 -5
+1
include/linux/radix-tree.h
··· 11 11 #include <linux/bitops.h> 12 12 #include <linux/kernel.h> 13 13 #include <linux/list.h> 14 + #include <linux/percpu.h> 14 15 #include <linux/preempt.h> 15 16 #include <linux/rcupdate.h> 16 17 #include <linux/spinlock.h>
-1
lib/radix-tree.c
··· 20 20 #include <linux/kernel.h> 21 21 #include <linux/kmemleak.h> 22 22 #include <linux/percpu.h> 23 - #include <linux/local_lock.h> 24 23 #include <linux/preempt.h> /* in_interrupt() */ 25 24 #include <linux/radix-tree.h> 26 25 #include <linux/rcupdate.h>
+1
tools/testing/radix-tree/linux/kernel.h
··· 22 22 #define __releases(x) 23 23 #define __must_hold(x) 24 24 25 + #define EXPORT_PER_CPU_SYMBOL_GPL(x) 25 26 #endif /* _KERNEL_H */
+8
tools/testing/radix-tree/linux/local_lock.h
··· 1 + #ifndef _LINUX_LOCAL_LOCK 2 + #define _LINUX_LOCAL_LOCK 3 + typedef struct { } local_lock_t; 4 + 5 + static inline void local_lock(local_lock_t *lock) { } 6 + static inline void local_unlock(local_lock_t *lock) { } 7 + #define INIT_LOCAL_LOCK(x) { } 8 + #endif
-4
tools/testing/radix-tree/test.h
··· 56 56 unsigned long node_maxindex(struct radix_tree_node *); 57 57 unsigned long shift_maxindex(unsigned int shift); 58 58 int radix_tree_cpu_dead(unsigned int cpu); 59 - struct radix_tree_preload { 60 - unsigned nr; 61 - struct radix_tree_node *nodes; 62 - }; 63 59 extern struct radix_tree_preload radix_tree_preloads;