Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0eb5afb3bae69a18bb4a8dbcbd361c4403fb54cd

Authored by Zhao Hongjiang
Committed by Chris Zankel
1 parent 478ba61afc
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

arch/xtensa/platforms/iss/simdisk.c
Diff comments   View file @ 0eb5afb
... ... @@ -108,13 +108,13 @@
108 108 sector_t sector = bio->bi_sector;
109 109  
110 110 bio_for_each_segment(bvec, bio, i) {
111   - char *buffer = __bio_kmap_atomic(bio, i, KM_USER0);
  111 + char *buffer = __bio_kmap_atomic(bio, i);
112 112 unsigned len = bvec->bv_len >> SECTOR_SHIFT;
113 113  
114 114 simdisk_transfer(dev, sector, len, buffer,
115 115 bio_data_dir(bio) == WRITE);
116 116 sector += len;
117   - __bio_kunmap_atomic(bio, KM_USER0);
  117 + __bio_kunmap_atomic(bio);
118 118 }
119 119 return 0;
120 120 }
... ... @@ -97,11 +97,11 @@
97 97 * permanent PIO fall back, user is probably better off disabling highmem
98 98 * I/O completely on that queue (see ide-dma for example)
99 99 */
100   -#define __bio_kmap_atomic(bio, idx, kmtype) \
  100 +#define __bio_kmap_atomic(bio, idx) \
101 101 (kmap_atomic(bio_iovec_idx((bio), (idx))->bv_page) + \
102 102 bio_iovec_idx((bio), (idx))->bv_offset)
103 103  
104   -#define __bio_kunmap_atomic(addr, kmtype) kunmap_atomic(addr)
  104 +#define __bio_kunmap_atomic(addr) kunmap_atomic(addr)
105 105  
106 106 /*
107 107 * merge helpers etc