diff options
| author | Zhao Hongjiang <zhaohongjiang@huawei.com> | 2013-07-08 15:22:50 +0800 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2013-07-08 01:23:15 -0700 |
| commit | 0eb5afb3bae69a18bb4a8dbcbd361c4403fb54cd (patch) | |
| tree | 3c9a1981692cf58324f5b068dbd9c23413d562e9 | |
| parent | 478ba61afccd3a4d7ca662cadff1d35d183fe67d (diff) | |
| download | linux-stable-0eb5afb3bae69a18bb4a8dbcbd361c4403fb54cd.tar.gz linux-stable-0eb5afb3bae69a18bb4a8dbcbd361c4403fb54cd.tar.bz2 linux-stable-0eb5afb3bae69a18bb4a8dbcbd361c4403fb54cd.zip | |
xtensa: remove the second argument of __bio_kmap_atomic()
kmap_atomic allows only one argument now, just remove the unused 'kmtype'.
Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Chris Zankel <chris@zankel.net>
| -rw-r--r-- | arch/xtensa/platforms/iss/simdisk.c | 4 | ||||
| -rw-r--r-- | include/linux/bio.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/xtensa/platforms/iss/simdisk.c b/arch/xtensa/platforms/iss/simdisk.c index c0edb35424ce..8c6e819cd8ed 100644 --- a/arch/xtensa/platforms/iss/simdisk.c +++ b/arch/xtensa/platforms/iss/simdisk.c @@ -108,13 +108,13 @@ static int simdisk_xfer_bio(struct simdisk *dev, struct bio *bio) sector_t sector = bio->bi_sector; bio_for_each_segment(bvec, bio, i) { - char *buffer = __bio_kmap_atomic(bio, i, KM_USER0); + char *buffer = __bio_kmap_atomic(bio, i); unsigned len = bvec->bv_len >> SECTOR_SHIFT; simdisk_transfer(dev, sector, len, buffer, bio_data_dir(bio) == WRITE); sector += len; - __bio_kunmap_atomic(bio, KM_USER0); + __bio_kunmap_atomic(bio); } return 0; } diff --git a/include/linux/bio.h b/include/linux/bio.h index ef24466d8f82..ec48bac5b039 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -97,11 +97,11 @@ static inline void *bio_data(struct bio *bio) * permanent PIO fall back, user is probably better off disabling highmem * I/O completely on that queue (see ide-dma for example) */ -#define __bio_kmap_atomic(bio, idx, kmtype) \ +#define __bio_kmap_atomic(bio, idx) \ (kmap_atomic(bio_iovec_idx((bio), (idx))->bv_page) + \ bio_iovec_idx((bio), (idx))->bv_offset) -#define __bio_kunmap_atomic(addr, kmtype) kunmap_atomic(addr) +#define __bio_kunmap_atomic(addr) kunmap_atomic(addr) /* * merge helpers etc |