diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-09 18:55:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-09 18:55:52 -0700 |
| commit | ec0e6bd3f11c0acf9cbcbe12da3ab45ac7cc7ead (patch) | |
| tree | 2411a0b7a05a6c6c0b43515806180033c8660ac0 /drivers | |
| parent | e7901af14398bf0272e523936d0774b4469741a8 (diff) | |
| parent | 691d5264158e58004904f285417fefaf8650ffe6 (diff) | |
| download | linux-exynos-ec0e6bd3f11c0acf9cbcbe12da3ab45ac7cc7ead.tar.gz linux-exynos-ec0e6bd3f11c0acf9cbcbe12da3ab45ac7cc7ead.tar.bz2 linux-exynos-ec0e6bd3f11c0acf9cbcbe12da3ab45ac7cc7ead.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"One performance optimization for page_clear and a couple of bug fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/mm: fix incorrect ASCE after crst_table_downgrade
s390/ftrace: fix crashes when switching tracers / add notrace to cpu_relax()
s390/pci: unify pci_iomap symbol exports
s390/pci: fix [un]map_resources sequence
s390: let the compiler do page clearing
s390/pci: fix possible information leak in mmio syscall
s390/dcss: array index 'i' is used before limits check.
s390/scm_block: fix off by one during cluster reservation
s390/jump label: improve and fix sanity check
s390/jump label: add missing jump_label_apply_nops() call
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/block/dcssblk.c | 2 | ||||
| -rw-r--r-- | drivers/s390/block/scm_blk_cluster.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index 96128cb009f3..da212813f2d5 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c @@ -547,7 +547,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char * parse input */ num_of_segments = 0; - for (i = 0; ((buf[i] != '\0') && (buf[i] != '\n') && i < count); i++) { + for (i = 0; (i < count && (buf[i] != '\0') && (buf[i] != '\n')); i++) { for (j = i; (buf[j] != ':') && (buf[j] != '\0') && (buf[j] != '\n') && diff --git a/drivers/s390/block/scm_blk_cluster.c b/drivers/s390/block/scm_blk_cluster.c index 09db45296eed..7497ddde2dd6 100644 --- a/drivers/s390/block/scm_blk_cluster.c +++ b/drivers/s390/block/scm_blk_cluster.c @@ -92,7 +92,7 @@ bool scm_reserve_cluster(struct scm_request *scmrq) add = 0; continue; } - for (pos = 0; pos <= iter->aob->request.msb_count; pos++) { + for (pos = 0; pos < iter->aob->request.msb_count; pos++) { if (clusters_intersect(req, iter->request[pos]) && (rq_data_dir(req) == WRITE || rq_data_dir(iter->request[pos]) == WRITE)) { |