diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-21 09:36:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-21 09:36:46 -0700 |
| commit | c4ad180f0e2ef98de48179aec7afe004562c0ec5 (patch) | |
| tree | 150e920f530a4a12b56102e96fdf81ddf466cb68 /drivers/s390/block | |
| parent | ARM: smp: Drop RCU_NONIDLE usage in cpu_die() (diff) | |
| parent | s390/pgtable: fix ipte notify bit (diff) | |
| download | linux-dev-c4ad180f0e2ef98de48179aec7afe004562c0ec5.tar.xz linux-dev-c4ad180f0e2ef98de48179aec7afe004562c0ec5.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 update from Martin Schwidefsky:
"An additional sysfs attribute for channel paths and a couple of bux
fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/pgtable: fix ipte notify bit
s390/xpram: mark xpram as non-rotational
s390/smp: fix cpu re-scan vs. cpu state
s390/cio: add channel ID sysfs attribute
s390/ftrace: fix mcount adjustment
s390: fix gmap_ipte_notifier vs. software dirty pages
s390: disable pfmf for clear page instruction
s390/disassembler: prevent endless loop in print_fn_code()
s390: remove non existent reference to GENERIC_KERNEL_THREAD
Diffstat (limited to 'drivers/s390/block')
| -rw-r--r-- | drivers/s390/block/xpram.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c index 690c3338a8ae..464dd29d06c0 100644 --- a/drivers/s390/block/xpram.c +++ b/drivers/s390/block/xpram.c @@ -343,6 +343,7 @@ static int __init xpram_setup_blkdev(void) put_disk(xpram_disks[i]); goto out; } + queue_flag_set_unlocked(QUEUE_FLAG_NONROT, xpram_queues[i]); blk_queue_make_request(xpram_queues[i], xpram_make_request); blk_queue_logical_block_size(xpram_queues[i], 4096); } |