diff options
| author | Keir Fraser <keir@xen.org> | 2011-06-23 11:27:38 +0100 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2011-06-23 11:27:38 +0100 |
| commit | eebfd58f212c5fb75e602ac1aa126863452375da (patch) | |
| tree | 8f4b07feacf34e316e1cc9a5ff90d3b3ea7eb61a /xen/include/xen/preempt.h | |
| parent | 66b29760bc32964308a5dcd5d8b0d75930d0bff8 (diff) | |
| download | xen-eebfd58f212c5fb75e602ac1aa126863452375da.tar.gz xen-eebfd58f212c5fb75e602ac1aa126863452375da.tar.bz2 xen-eebfd58f212c5fb75e602ac1aa126863452375da.zip | |
Simplify preempt.h dependencies by moving in_atomic() to preempt.c
..clean up the ensuing fallout.
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/include/xen/preempt.h')
| -rw-r--r-- | xen/include/xen/preempt.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xen/include/xen/preempt.h b/xen/include/xen/preempt.h index 749bc589cb..f4228058e5 100644 --- a/xen/include/xen/preempt.h +++ b/xen/include/xen/preempt.h @@ -10,9 +10,8 @@ #define __XEN_PREEMPT_H__ #include <xen/config.h> +#include <xen/types.h> #include <xen/percpu.h> -#include <xen/irq.h> /* in_irq() */ -#include <asm/system.h> /* local_irq_is_enabled() */ DECLARE_PER_CPU(unsigned int, __preempt_count); @@ -28,6 +27,6 @@ DECLARE_PER_CPU(unsigned int, __preempt_count); preempt_count()--; \ } while (0) -#define in_atomic() (preempt_count() || in_irq() || !local_irq_is_enabled()) +bool_t in_atomic(void); #endif /* __XEN_PREEMPT_H__ */ |