diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/hardirq.h | 2 | ||||
-rw-r--r-- | include/linux/smp_lock.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h index 8f3f467c57c..bea1612d8f5 100644 --- a/include/linux/hardirq.h +++ b/include/linux/hardirq.h | |||
@@ -96,7 +96,7 @@ | |||
96 | #define in_nmi() (preempt_count() & NMI_MASK) | 96 | #define in_nmi() (preempt_count() & NMI_MASK) |
97 | 97 | ||
98 | #if defined(CONFIG_PREEMPT) && defined(CONFIG_BKL) | 98 | #if defined(CONFIG_PREEMPT) && defined(CONFIG_BKL) |
99 | # define PREEMPT_INATOMIC_BASE kernel_locked() | 99 | # define PREEMPT_INATOMIC_BASE (current->lock_depth >= 0) |
100 | #else | 100 | #else |
101 | # define PREEMPT_INATOMIC_BASE 0 | 101 | # define PREEMPT_INATOMIC_BASE 0 |
102 | #endif | 102 | #endif |
diff --git a/include/linux/smp_lock.h b/include/linux/smp_lock.h index 291f721144c..3a198820273 100644 --- a/include/linux/smp_lock.h +++ b/include/linux/smp_lock.h | |||
@@ -4,8 +4,6 @@ | |||
4 | #ifdef CONFIG_LOCK_KERNEL | 4 | #ifdef CONFIG_LOCK_KERNEL |
5 | #include <linux/sched.h> | 5 | #include <linux/sched.h> |
6 | 6 | ||
7 | #define kernel_locked() (current->lock_depth >= 0) | ||
8 | |||
9 | extern int __lockfunc __reacquire_kernel_lock(void); | 7 | extern int __lockfunc __reacquire_kernel_lock(void); |
10 | extern void __lockfunc __release_kernel_lock(void); | 8 | extern void __lockfunc __release_kernel_lock(void); |
11 | 9 | ||
@@ -58,7 +56,6 @@ static inline void cycle_kernel_lock(void) | |||
58 | #define lock_kernel() | 56 | #define lock_kernel() |
59 | #define unlock_kernel() | 57 | #define unlock_kernel() |
60 | #define cycle_kernel_lock() do { } while(0) | 58 | #define cycle_kernel_lock() do { } while(0) |
61 | #define kernel_locked() 1 | ||
62 | #endif /* CONFIG_BKL */ | 59 | #endif /* CONFIG_BKL */ |
63 | 60 | ||
64 | #define release_kernel_lock(task) do { } while(0) | 61 | #define release_kernel_lock(task) do { } while(0) |