radix tree test suite: Reduce kernel.h
Many of the definitions in the radix-tree kernel.h are redundant with others in tools/include, or are no longer used, such as panic(). Move the definition of __init to init.h and in_interrupt() to preempt.h Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
This commit is contained in:
parent
7a4f11b889
commit
ab3a1ffd11
|
@ -1 +1 @@
|
|||
/* An empty file stub that allows radix-tree.c to compile. */
|
||||
#define __init
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
#ifndef _KERNEL_H
|
||||
#define _KERNEL_H
|
||||
|
||||
#include <assert.h>
|
||||
#include "../../include/linux/kernel.h"
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stddef.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include <linux/compiler.h>
|
||||
|
@ -19,47 +18,11 @@
|
|||
#define RADIX_TREE_MAP_SHIFT 3
|
||||
#endif
|
||||
|
||||
#ifndef NULL
|
||||
#define NULL 0
|
||||
#endif
|
||||
|
||||
#define BUG_ON(expr) assert(!(expr))
|
||||
#define __init
|
||||
#define __must_check
|
||||
#define panic(expr)
|
||||
#define printk printf
|
||||
#define __force
|
||||
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
|
||||
#define pr_debug printk
|
||||
|
||||
#define smp_rmb() barrier()
|
||||
#define smp_wmb() barrier()
|
||||
#define cpu_relax() barrier()
|
||||
|
||||
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
|
||||
|
||||
#define container_of(ptr, type, member) ({ \
|
||||
const typeof( ((type *)0)->member ) *__mptr = (ptr); \
|
||||
(type *)( (char *)__mptr - offsetof(type, member) );})
|
||||
#define min(a, b) ((a) < (b) ? (a) : (b))
|
||||
|
||||
#define cond_resched() sched_yield()
|
||||
|
||||
static inline int in_interrupt(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* This looks more complex than it should be. But we need to
|
||||
* get the type for the ~ right in round_down (it needs to be
|
||||
* as wide as the result!), and we want to evaluate the macro
|
||||
* arguments just once each.
|
||||
*/
|
||||
#define __round_mask(x, y) ((__typeof__(x))((y)-1))
|
||||
#define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
|
||||
#define round_down(x, y) ((x) & ~__round_mask(x, y))
|
||||
|
||||
#define xchg(ptr, x) uatomic_xchg(ptr, x)
|
||||
|
||||
#endif /* _KERNEL_H */
|
||||
|
|
|
@ -1,4 +1,14 @@
|
|||
#ifndef __LINUX_PREEMPT_H
|
||||
#define __LINUX_PREEMPT_H
|
||||
|
||||
extern int preempt_count;
|
||||
|
||||
#define preempt_disable() uatomic_inc(&preempt_count)
|
||||
#define preempt_enable() uatomic_dec(&preempt_count)
|
||||
|
||||
static inline int in_interrupt(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif /* __LINUX_PREEMPT_H */
|
||||
|
|
Loading…
Reference in New Issue