---

yaml --- r: 222187 b: refs/heads/master c: 7957f0a h: refs/heads/master i: 222185: 6206121 222183: 20a5230 v: v3
git-mirror · Nov 17, 2010 · e615ad3 · e615ad3
1 parent 6179ac9
commit e615ad3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 460781b54253e3ed10a0a2a433bdc548ec952269
+refs/heads/master: 7957f0a857754c555e07f58a3fb83ac29501478c
diff --git a/trunk/include/linux/hardirq.h b/trunk/include/linux/hardirq.h
@@ -96,7 +96,7 @@
 #define in_nmi()	(preempt_count() & NMI_MASK)
 
 #if defined(CONFIG_PREEMPT) && defined(CONFIG_BKL)
-# define PREEMPT_INATOMIC_BASE kernel_locked()
+# define PREEMPT_INATOMIC_BASE (current->lock_depth >= 0)
 #else
 # define PREEMPT_INATOMIC_BASE 0
 #endif

diff --git a/trunk/include/linux/smp_lock.h b/trunk/include/linux/smp_lock.h
@@ -4,8 +4,6 @@
 #ifdef CONFIG_LOCK_KERNEL
 #include <linux/sched.h>
 
-#define kernel_locked()		(current->lock_depth >= 0)
-
 extern int __lockfunc __reacquire_kernel_lock(void);
 extern void __lockfunc __release_kernel_lock(void);
 
@@ -58,7 +56,6 @@ static inline void cycle_kernel_lock(void)
 #define lock_kernel()
 #define unlock_kernel()
 #define cycle_kernel_lock()			do { } while(0)
-#define kernel_locked()				1
 #endif /* CONFIG_BKL */
 
 #define release_kernel_lock(task)		do { } while(0)