git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
kernel
/
rwsem.c
diff --git
a/kernel/rwsem.c
b/kernel/rwsem.c
index
cae050b
..
9f48f3d
100644
(file)
--- a/
kernel/rwsem.c
+++ b/
kernel/rwsem.c
@@
-11,7
+11,7
@@
#include <linux/rwsem.h>
#include <asm/system.h>
#include <linux/rwsem.h>
#include <asm/system.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
/*
* lock for reading
/*
* lock for reading
@@
-117,15
+117,6
@@
void down_read_nested(struct rw_semaphore *sem, int subclass)
EXPORT_SYMBOL(down_read_nested);
EXPORT_SYMBOL(down_read_nested);
-void down_read_non_owner(struct rw_semaphore *sem)
-{
- might_sleep();
-
- __down_read(sem);
-}
-
-EXPORT_SYMBOL(down_read_non_owner);
-
void down_write_nested(struct rw_semaphore *sem, int subclass)
{
might_sleep();
void down_write_nested(struct rw_semaphore *sem, int subclass)
{
might_sleep();
@@
-136,13
+127,6
@@
void down_write_nested(struct rw_semaphore *sem, int subclass)
EXPORT_SYMBOL(down_write_nested);
EXPORT_SYMBOL(down_write_nested);
-void up_read_non_owner(struct rw_semaphore *sem)
-{
- __up_read(sem);
-}
-
-EXPORT_SYMBOL(up_read_non_owner);
-
#endif
#endif