aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2013-03-24 23:42:45 -0400
committerJens Axboe <axboe@kernel.dk>2013-03-24 23:42:45 -0400
commite226e34165d6ea827fcbd6fbf4df49090c4d0dbc (patch)
tree05d472b77db4e3dd68ea1277e0b966263040dcec /kernel
parent5bbcf5e6abe97485748b51ea0713cc3012b4a8f0 (diff)
parentcafe563591446cf80bfbc2fe3bc72a2e36cf1060 (diff)
Merge branch 'bcache-for-upstream' of http://evilpiepirate.org/git/linux-bcache into for-3.10/drivers
Diffstat (limited to 'kernel')
-rw-r--r--kernel/fork.c4
-rw-r--r--kernel/lockdep.c1
-rw-r--r--kernel/rwsem.c16
-rw-r--r--kernel/trace/blktrace.c1
4 files changed, 22 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 1766d324d5e3..7b54fb62332c 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1303,6 +1303,10 @@ static struct task_struct *copy_process(unsigned long clone_flags,
1303 p->memcg_batch.do_batch = 0; 1303 p->memcg_batch.do_batch = 0;
1304 p->memcg_batch.memcg = NULL; 1304 p->memcg_batch.memcg = NULL;
1305#endif 1305#endif
1306#ifdef CONFIG_BCACHE
1307 p->sequential_io = 0;
1308 p->sequential_io_avg = 0;
1309#endif
1306 1310
1307 /* Perform scheduler related setup. Assign this task to a CPU. */ 1311 /* Perform scheduler related setup. Assign this task to a CPU. */
1308 sched_fork(p); 1312 sched_fork(p);
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 259db207b5d9..60248a78bec0 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -2997,6 +2997,7 @@ void lockdep_init_map(struct lockdep_map *lock, const char *name,
2997EXPORT_SYMBOL_GPL(lockdep_init_map); 2997EXPORT_SYMBOL_GPL(lockdep_init_map);
2998 2998
2999struct lock_class_key __lockdep_no_validate__; 2999struct lock_class_key __lockdep_no_validate__;
3000EXPORT_SYMBOL_GPL(__lockdep_no_validate__);
3000 3001
3001static int 3002static int
3002print_lock_nested_lock_not_held(struct task_struct *curr, 3003print_lock_nested_lock_not_held(struct task_struct *curr,
diff --git a/kernel/rwsem.c b/kernel/rwsem.c
index b3c6c3fcd847..cfff1435bdfb 100644
--- a/kernel/rwsem.c
+++ b/kernel/rwsem.c
@@ -126,6 +126,15 @@ void _down_write_nest_lock(struct rw_semaphore *sem, struct lockdep_map *nest)
126 126
127EXPORT_SYMBOL(_down_write_nest_lock); 127EXPORT_SYMBOL(_down_write_nest_lock);
128 128
129void down_read_non_owner(struct rw_semaphore *sem)
130{
131 might_sleep();
132
133 __down_read(sem);
134}
135
136EXPORT_SYMBOL(down_read_non_owner);
137
129void down_write_nested(struct rw_semaphore *sem, int subclass) 138void down_write_nested(struct rw_semaphore *sem, int subclass)
130{ 139{
131 might_sleep(); 140 might_sleep();
@@ -136,6 +145,13 @@ void down_write_nested(struct rw_semaphore *sem, int subclass)
136 145
137EXPORT_SYMBOL(down_write_nested); 146EXPORT_SYMBOL(down_write_nested);
138 147
148void up_read_non_owner(struct rw_semaphore *sem)
149{
150 __up_read(sem);
151}
152
153EXPORT_SYMBOL(up_read_non_owner);
154
139#endif 155#endif
140 156
141 157
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 9e5b8c272eec..20d8a9825f96 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1828,6 +1828,7 @@ void blk_fill_rwbs(char *rwbs, u32 rw, int bytes)
1828 1828
1829 rwbs[i] = '\0'; 1829 rwbs[i] = '\0';
1830} 1830}
1831EXPORT_SYMBOL_GPL(blk_fill_rwbs);
1831 1832
1832#endif /* CONFIG_EVENT_TRACING */ 1833#endif /* CONFIG_EVENT_TRACING */
1833 1834