diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /fs/bio.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'fs/bio.c')
| -rw-r--r-- | fs/bio.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -917,8 +917,8 @@ void bio_copy_data(struct bio *dst, struct bio *src) | |||
| 917 | src_p = kmap_atomic(src_bv->bv_page); | 917 | src_p = kmap_atomic(src_bv->bv_page); |
| 918 | dst_p = kmap_atomic(dst_bv->bv_page); | 918 | dst_p = kmap_atomic(dst_bv->bv_page); |
| 919 | 919 | ||
| 920 | memcpy(dst_p + dst_bv->bv_offset, | 920 | memcpy(dst_p + dst_offset, |
| 921 | src_p + src_bv->bv_offset, | 921 | src_p + src_offset, |
| 922 | bytes); | 922 | bytes); |
| 923 | 923 | ||
| 924 | kunmap_atomic(dst_p); | 924 | kunmap_atomic(dst_p); |