diff options
Diffstat (limited to 'include/linux/hardirq.h')
| -rw-r--r-- | include/linux/hardirq.h | 9 | 
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h index 32f9fd6619b4..ba362171e8ae 100644 --- a/include/linux/hardirq.h +++ b/include/linux/hardirq.h @@ -93,13 +93,6 @@   */  #define in_nmi()	(preempt_count() & NMI_MASK) -#if defined(CONFIG_PREEMPT) && defined(CONFIG_BKL) -# include <linux/sched.h> -# define PREEMPT_INATOMIC_BASE (current->lock_depth >= 0) -#else -# define PREEMPT_INATOMIC_BASE 0 -#endif -  #if defined(CONFIG_PREEMPT)  # define PREEMPT_CHECK_OFFSET 1  #else @@ -113,7 +106,7 @@   * used in the general case to determine whether sleeping is possible.   * Do not use in_atomic() in driver code.   */ -#define in_atomic()	((preempt_count() & ~PREEMPT_ACTIVE) != PREEMPT_INATOMIC_BASE) +#define in_atomic()	((preempt_count() & ~PREEMPT_ACTIVE) != 0)  /*   * Check whether we were atomic before we did preempt_disable():  | 
