diff options
Diffstat (limited to 'include/linux/smp_lock.h')
| -rw-r--r-- | include/linux/smp_lock.h | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/include/linux/smp_lock.h b/include/linux/smp_lock.h index 813be59bf345..3a1988202731 100644 --- a/include/linux/smp_lock.h +++ b/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); @@ -24,8 +22,21 @@ static inline int reacquire_kernel_lock(struct task_struct *task) return 0; } -extern void __lockfunc lock_kernel(void) __acquires(kernel_lock); -extern void __lockfunc unlock_kernel(void) __releases(kernel_lock); +extern void __lockfunc +_lock_kernel(const char *func, const char *file, int line) +__acquires(kernel_lock); + +extern void __lockfunc +_unlock_kernel(const char *func, const char *file, int line) +__releases(kernel_lock); + +#define lock_kernel() do { \ + _lock_kernel(__func__, __FILE__, __LINE__); \ +} while (0) + +#define unlock_kernel() do { \ + _unlock_kernel(__func__, __FILE__, __LINE__); \ +} while (0) /* * Various legacy drivers don't really need the BKL in a specific @@ -41,12 +52,14 @@ static inline void cycle_kernel_lock(void) #else -#define lock_kernel() do { } while(0) -#define unlock_kernel() do { } while(0) -#define release_kernel_lock(task) do { } while(0) +#ifdef CONFIG_BKL /* provoke build bug if not set */ +#define lock_kernel() +#define unlock_kernel() #define cycle_kernel_lock() do { } while(0) +#endif /* CONFIG_BKL */ + +#define release_kernel_lock(task) do { } while(0) #define reacquire_kernel_lock(task) 0 -#define kernel_locked() 1 #endif /* CONFIG_LOCK_KERNEL */ #endif /* __LINUX_SMPLOCK_H */ |