diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 09:14:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 09:14:07 -0700 |
| commit | 798ce8f1cca29dcc3f4b55947f611f4ffb32ac2b (patch) | |
| tree | 15fba84ba4b930397c29fe562504f66211365699 /drivers/block | |
| parent | 22e12bbc9bc38c6d0bd541d061a0f547596fc19d (diff) | |
| parent | 1547010e6e15a3f44f49381246421a1e19de526e (diff) | |
| download | linux-3.10-798ce8f1cca29dcc3f4b55947f611f4ffb32ac2b.tar.gz linux-3.10-798ce8f1cca29dcc3f4b55947f611f4ffb32ac2b.tar.bz2 linux-3.10-798ce8f1cca29dcc3f4b55947f611f4ffb32ac2b.zip | |
Merge branch 'for-2.6.40/core' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.40/core' of git://git.kernel.dk/linux-2.6-block: (40 commits)
cfq-iosched: free cic_index if cfqd allocation fails
cfq-iosched: remove unused 'group_changed' in cfq_service_tree_add()
cfq-iosched: reduce bit operations in cfq_choose_req()
cfq-iosched: algebraic simplification in cfq_prio_to_maxrq()
blk-cgroup: Initialize ioc->cgroup_changed at ioc creation time
block: move bd_set_size() above rescan_partitions() in __blkdev_get()
block: call elv_bio_merged() when merged
cfq-iosched: Make IO merge related stats per cpu
cfq-iosched: Fix a memory leak of per cpu stats for root group
backing-dev: Kill set but not used var in bdi_debug_stats_show()
block: get rid of on-stack plugging debug checks
blk-throttle: Make no throttling rule group processing lockless
blk-cgroup: Make cgroup stat reset path blkg->lock free for dispatch stats
blk-cgroup: Make 64bit per cpu stats safe on 32bit arch
blk-throttle: Make dispatch stats per cpu
blk-throttle: Free up a group only after one rcu grace period
blk-throttle: Use helper function to add root throtl group to lists
blk-throttle: Introduce a helper function to fill in device details
blk-throttle: Dynamically allocate root group
blk-cgroup: Allow sleeping while dynamically allocating a group
...
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/paride/pcd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c index 8690e31d993..a0aabd904a5 100644 --- a/drivers/block/paride/pcd.c +++ b/drivers/block/paride/pcd.c @@ -320,6 +320,8 @@ static void pcd_init_units(void) disk->first_minor = unit; strcpy(disk->disk_name, cd->name); /* umm... */ disk->fops = &pcd_bdops; + disk->flags = GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE; + disk->events = DISK_EVENT_MEDIA_CHANGE; } } |