[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1295385422-3592-4-git-send-email-arnd@arndb.de>
Date: Tue, 18 Jan 2011 22:17:01 +0100
From: Arnd Bergmann <arnd@...db.de>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: LKML <linux-kernel@...r.kernel.org>, Arnd Bergmann <arnd@...db.de>
Subject: [PATCH 3/4] BKL: mark lock_kernel as deprecated
No new code should use the big kernel lock, so
we should really emit compiler warnings to make
people building out of mainline code aware of
this.
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
include/linux/smp_lock.h | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/include/linux/smp_lock.h b/include/linux/smp_lock.h
index 3a19882..a06eb78 100644
--- a/include/linux/smp_lock.h
+++ b/include/linux/smp_lock.h
@@ -30,24 +30,14 @@ 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)
+static inline void __deprecated lock_kernel(void)
+{
+ _lock_kernel(__func__, __FILE__, __LINE__);
+}
-/*
- * 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)
+static inline void __deprecated unlock_kernel(void)
{
- lock_kernel();
- unlock_kernel();
+ _unlock_kernel(__func__, __FILE__, __LINE__);
}
#else
@@ -55,7 +45,6 @@ static inline void cycle_kernel_lock(void)
#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)
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists