A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into for-2.6.35

Browse source 
Conflicts:
	fs/ext3/fsync.c

Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
Jens Axboe 2010-05-21 21:27:26 +02:00
commit ee9a3607fb
5727 changed files with 379086 additions and 149040 deletions
Download patch file Download diff file Expand all files Collapse all files

2
block/cfq-iosched.c
View file

@ -3741,8 +3741,10 @@ static void *cfq_init_queue(struct request_queue *q)
* to make sure that cfq_put_cfqg() does not try to kfree root group
*/
atomic_set(&cfqg->ref, 1);
rcu_read_lock();
blkiocg_add_blkio_group(&blkio_root_cgroup, &cfqg->blkg, (void *)cfqd,
0);
rcu_read_unlock();
#endif
/*
* Not strictly needed (since RB_ROOT just clears the node and we