diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /kernel/rwsem.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'kernel/rwsem.c')
-rw-r--r-- | kernel/rwsem.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/kernel/rwsem.c b/kernel/rwsem.c index b3c6c3fcd84..9f48f3d82e9 100644 --- a/kernel/rwsem.c +++ b/kernel/rwsem.c | |||
@@ -7,9 +7,10 @@ | |||
7 | #include <linux/types.h> | 7 | #include <linux/types.h> |
8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
9 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
10 | #include <linux/export.h> | 10 | #include <linux/module.h> |
11 | #include <linux/rwsem.h> | 11 | #include <linux/rwsem.h> |
12 | 12 | ||
13 | #include <asm/system.h> | ||
13 | #include <linux/atomic.h> | 14 | #include <linux/atomic.h> |
14 | 15 | ||
15 | /* | 16 | /* |
@@ -116,16 +117,6 @@ void down_read_nested(struct rw_semaphore *sem, int subclass) | |||
116 | 117 | ||
117 | EXPORT_SYMBOL(down_read_nested); | 118 | EXPORT_SYMBOL(down_read_nested); |
118 | 119 | ||
119 | void _down_write_nest_lock(struct rw_semaphore *sem, struct lockdep_map *nest) | ||
120 | { | ||
121 | might_sleep(); | ||
122 | rwsem_acquire_nest(&sem->dep_map, 0, 0, nest, _RET_IP_); | ||
123 | |||
124 | LOCK_CONTENDED(sem, __down_write_trylock, __down_write); | ||
125 | } | ||
126 | |||
127 | EXPORT_SYMBOL(_down_write_nest_lock); | ||
128 | |||
129 | void down_write_nested(struct rw_semaphore *sem, int subclass) | 120 | void down_write_nested(struct rw_semaphore *sem, int subclass) |
130 | { | 121 | { |
131 | might_sleep(); | 122 | might_sleep(); |