1 files changed, 25 insertions, 58 deletions
diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h
index f99fe90732ab..658afb37c3f5 100644
--- a/include/linux/rwsem.h
+++ b/include/linux/rwsem.h
@@ -9,8 +9,6 @@
 #include <linux/linkage.h>
-#define RWSEM_DEBUG 0
 #ifdef __KERNEL__
 #include <linux/types.h>
@@ -26,89 +24,58 @@ struct rw_semaphore;
 #include <asm/rwsem.h> /* use an arch-specific implementation */
 #endif
-#ifndef rwsemtrace
-#if RWSEM_DEBUG
-extern void FASTCALL(rwsemtrace(struct rw_semaphore *sem, const char *str));
-#else
-#define rwsemtrace(SEM,FMT)
-#endif
-#endif
 /*
 * lock for reading
 */
-static inline void down_read(struct rw_semaphore *sem)
+extern void down_read(struct rw_semaphore *sem);
-{
-        might_sleep();
-        rwsemtrace(sem,"Entering down_read");
-        __down_read(sem);
-        rwsemtrace(sem,"Leaving down_read");
-}
 /*
 * trylock for reading -- returns 1 if successful, 0 if contention
 */
-static inline int down_read_trylock(struct rw_semaphore *sem)
+extern int down_read_trylock(struct rw_semaphore *sem);
-{
-        int ret;
-        rwsemtrace(sem,"Entering down_read_trylock");
-        ret = __down_read_trylock(sem);
-        rwsemtrace(sem,"Leaving down_read_trylock");
-        return ret;
-}
 /*
 * lock for writing
 */
-static inline void down_write(struct rw_semaphore *sem)
+extern void down_write(struct rw_semaphore *sem);
-{
-        might_sleep();
-        rwsemtrace(sem,"Entering down_write");
-        __down_write(sem);
-        rwsemtrace(sem,"Leaving down_write");
-}
 /*
 * trylock for writing -- returns 1 if successful, 0 if contention
 */
-static inline int down_write_trylock(struct rw_semaphore *sem)
+extern int down_write_trylock(struct rw_semaphore *sem);
-{
-        int ret;
-        rwsemtrace(sem,"Entering down_write_trylock");
-        ret = __down_write_trylock(sem);
-        rwsemtrace(sem,"Leaving down_write_trylock");
-        return ret;
-}
 /*
 * release a read lock
 */
-static inline void up_read(struct rw_semaphore *sem)
+extern void up_read(struct rw_semaphore *sem);
-{
-        rwsemtrace(sem,"Entering up_read");
-        __up_read(sem);
-        rwsemtrace(sem,"Leaving up_read");
-}
 /*
 * release a write lock
 */
-static inline void up_write(struct rw_semaphore *sem)
+extern void up_write(struct rw_semaphore *sem);
-{
-        rwsemtrace(sem,"Entering up_write");
-        __up_write(sem);
-        rwsemtrace(sem,"Leaving up_write");
-}
 /*
 * downgrade write lock to read lock
 */
-static inline void downgrade_write(struct rw_semaphore *sem)
+extern void downgrade_write(struct rw_semaphore *sem);
-{
-        rwsemtrace(sem,"Entering downgrade_write");
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-        __downgrade_write(sem);
+/*
-        rwsemtrace(sem,"Leaving downgrade_write");
+ * nested locking:
-}
+ */
+extern void down_read_nested(struct rw_semaphore *sem, int subclass);
+extern void down_write_nested(struct rw_semaphore *sem, int subclass);
+/*
+ * Take/release a lock when not the owner will release it:
+ */
+extern void down_read_non_owner(struct rw_semaphore *sem);
+extern void up_read_non_owner(struct rw_semaphore *sem);
+#else
+# define down_read_nested(sem, subclass)                down_read(sem)
+# define down_write_nested(sem, subclass)       down_write(sem)
+# define down_read_non_owner(sem)               down_read(sem)
+# define up_read_non_owner(sem)                 up_read(sem)
+#endif
 #endif /* __KERNEL__ */
 #endif /* _LINUX_RWSEM_H */

diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h index f99fe90732ab..658afb37c3f5 100644 --- a/include/linux/rwsem.h +++ b/include/linux/rwsem.h
@@ -9,8 +9,6 @@
9		9
10	#include <linux/linkage.h>	10	#include <linux/linkage.h>
11		11
12	#define RWSEM_DEBUG 0
13
14	#ifdef __KERNEL__	12	#ifdef __KERNEL__
15		13
16	#include <linux/types.h>	14	#include <linux/types.h>
@@ -26,89 +24,58 @@ struct rw_semaphore;
26	#include <asm/rwsem.h> /* use an arch-specific implementation */	24	#include <asm/rwsem.h> /* use an arch-specific implementation */
27	#endif	25	#endif
28		26
29	#ifndef rwsemtrace
30	#if RWSEM_DEBUG
31	extern void FASTCALL(rwsemtrace(struct rw_semaphore sem, const char str));
32	#else
33	#define rwsemtrace(SEM,FMT)
34	#endif
35	#endif
36
37	/*	27	/*
38	* lock for reading	28	* lock for reading
39	*/	29	*/
40	static inline void down_read(struct rw_semaphore *sem)	30	extern void down_read(struct rw_semaphore *sem);
41	{
42	might_sleep();
43	rwsemtrace(sem,"Entering down_read");
44	__down_read(sem);
45	rwsemtrace(sem,"Leaving down_read");
46	}
47		31
48	/*	32	/*
49	* trylock for reading -- returns 1 if successful, 0 if contention	33	* trylock for reading -- returns 1 if successful, 0 if contention
50	*/	34	*/
51	static inline int down_read_trylock(struct rw_semaphore *sem)	35	extern int down_read_trylock(struct rw_semaphore *sem);
52	{
53	int ret;
54	rwsemtrace(sem,"Entering down_read_trylock");
55	ret = __down_read_trylock(sem);
56	rwsemtrace(sem,"Leaving down_read_trylock");
57	return ret;
58	}
59		36
60	/*	37	/*
61	* lock for writing	38	* lock for writing
62	*/	39	*/
63	static inline void down_write(struct rw_semaphore *sem)	40	extern void down_write(struct rw_semaphore *sem);
64	{
65	might_sleep();
66	rwsemtrace(sem,"Entering down_write");
67	__down_write(sem);
68	rwsemtrace(sem,"Leaving down_write");
69	}
70		41
71	/*	42	/*
72	* trylock for writing -- returns 1 if successful, 0 if contention	43	* trylock for writing -- returns 1 if successful, 0 if contention
73	*/	44	*/
74	static inline int down_write_trylock(struct rw_semaphore *sem)	45	extern int down_write_trylock(struct rw_semaphore *sem);
75	{
76	int ret;
77	rwsemtrace(sem,"Entering down_write_trylock");
78	ret = __down_write_trylock(sem);
79	rwsemtrace(sem,"Leaving down_write_trylock");
80	return ret;
81	}
82		46
83	/*	47	/*
84	* release a read lock	48	* release a read lock
85	*/	49	*/
86	static inline void up_read(struct rw_semaphore *sem)	50	extern void up_read(struct rw_semaphore *sem);
87	{
88	rwsemtrace(sem,"Entering up_read");
89	__up_read(sem);
90	rwsemtrace(sem,"Leaving up_read");
91	}
92		51
93	/*	52	/*
94	* release a write lock	53	* release a write lock
95	*/	54	*/
96	static inline void up_write(struct rw_semaphore *sem)	55	extern void up_write(struct rw_semaphore *sem);
97	{
98	rwsemtrace(sem,"Entering up_write");
99	__up_write(sem);
100	rwsemtrace(sem,"Leaving up_write");
101	}
102		56
103	/*	57	/*
104	* downgrade write lock to read lock	58	* downgrade write lock to read lock
105	*/	59	*/
106	static inline void downgrade_write(struct rw_semaphore *sem)	60	extern void downgrade_write(struct rw_semaphore *sem);
107	{	61
108	rwsemtrace(sem,"Entering downgrade_write");	62	#ifdef CONFIG_DEBUG_LOCK_ALLOC
109	__downgrade_write(sem);	63	/*
110	rwsemtrace(sem,"Leaving downgrade_write");	64	* nested locking:
111	}	65	*/
		66	extern void down_read_nested(struct rw_semaphore *sem, int subclass);
		67	extern void down_write_nested(struct rw_semaphore *sem, int subclass);
		68	/*
		69	* Take/release a lock when not the owner will release it:
		70	*/
		71	extern void down_read_non_owner(struct rw_semaphore *sem);
		72	extern void up_read_non_owner(struct rw_semaphore *sem);
		73	#else
		74	# define down_read_nested(sem, subclass) down_read(sem)
		75	# define down_write_nested(sem, subclass) down_write(sem)
		76	# define down_read_non_owner(sem) down_read(sem)
		77	# define up_read_non_owner(sem) up_read(sem)
		78	#endif
112		79
113	#endif /* __KERNEL__ */	80	#endif /* __KERNEL__ */
114	#endif /* _LINUX_RWSEM_H */	81	#endif /* _LINUX_RWSEM_H */