aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/hardirq.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/hardirq.h')
-rw-r--r--include/linux/hardirq.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index e6dd5a456ba..ef18786a7b4 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -95,7 +95,7 @@
95 */ 95 */
96#define in_nmi() (preempt_count() & NMI_MASK) 96#define in_nmi() (preempt_count() & NMI_MASK)
97 97
98#if defined(CONFIG_PREEMPT) 98#if defined(CONFIG_PREEMPT_COUNT)
99# define PREEMPT_CHECK_OFFSET 1 99# define PREEMPT_CHECK_OFFSET 1
100#else 100#else
101# define PREEMPT_CHECK_OFFSET 0 101# define PREEMPT_CHECK_OFFSET 0
@@ -117,7 +117,7 @@
117#define in_atomic_preempt_off() \ 117#define in_atomic_preempt_off() \
118 ((preempt_count() & ~PREEMPT_ACTIVE) != PREEMPT_CHECK_OFFSET) 118 ((preempt_count() & ~PREEMPT_ACTIVE) != PREEMPT_CHECK_OFFSET)
119 119
120#ifdef CONFIG_PREEMPT 120#ifdef CONFIG_PREEMPT_COUNT
121# define preemptible() (preempt_count() == 0 && !irqs_disabled()) 121# define preemptible() (preempt_count() == 0 && !irqs_disabled())
122# define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1) 122# define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1)
123#else 123#else