diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-03 14:16:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-03 14:16:27 +1100 |
| commit | 37caa847f08cbbbec230ae62b56f96fb4bd517d3 (patch) | |
| tree | b24d0e4c32c462c5ae59eec84ee2d70d1a66a170 /include | |
| parent | ee448b61975936e2fc374c245d4480cbb6178340 (diff) | |
| parent | a3ba01b63468c925518da2da0ac3be11358f60cb (diff) | |
Merge remote branch 'bkl-config/config'
Conflicts:
arch/powerpc/kernel/setup_64.c
drivers/staging/stradis/Kconfig
fs/nfsd/nfs4state.c
include/linux/hardirq.h
include/linux/smp_lock.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/smp_lock.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/include/linux/smp_lock.h b/include/linux/smp_lock.h index 3a1988202731..c42c58cb065d 100644 --- a/include/linux/smp_lock.h +++ b/include/linux/smp_lock.h @@ -24,10 +24,12 @@ static inline int reacquire_kernel_lock(struct task_struct *task) extern void __lockfunc _lock_kernel(const char *func, const char *file, int line) +__deprecated __acquires(kernel_lock); extern void __lockfunc _unlock_kernel(const char *func, const char *file, int line) +__deprecated __releases(kernel_lock); #define lock_kernel() do { \ @@ -38,24 +40,11 @@ __releases(kernel_lock); _unlock_kernel(__func__, __FILE__, __LINE__); \ } while (0) -/* - * Various legacy drivers don't really need the BKL in a specific - * function, but they *do* need to know that the BKL became available. - * This function just avoids wrapping a bunch of lock/unlock pairs - * around code which doesn't really need it. - */ -static inline void cycle_kernel_lock(void) -{ - lock_kernel(); - unlock_kernel(); -} - #else #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) |