diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-25 13:03:56 -0400 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-25 13:03:56 -0400 |
| commit | 593d1006cdf710ab3469c0c37c184fea0bc3da97 (patch) | |
| tree | e4db58440018a52089e8d6b39160f753ab10df99 /drivers/scsi/virtio_scsi.c | |
| parent | 5217192b85480353aeeb395574e60d0db04f3676 (diff) | |
| parent | 9b20aa63b8fc9a6a3b6831f4eae3621755e51211 (diff) | |
Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b
Resolved conflict in kernel/sched/core.c using Peter Zijlstra's
approach from https://lkml.org/lkml/2012/9/5/585.
Diffstat (limited to 'drivers/scsi/virtio_scsi.c')
| -rw-r--r-- | drivers/scsi/virtio_scsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index c7030fbee79c..3e79a2f00042 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c | |||
| @@ -331,7 +331,7 @@ static void virtscsi_map_sgl(struct scatterlist *sg, unsigned int *p_idx, | |||
| 331 | int i; | 331 | int i; |
| 332 | 332 | ||
| 333 | for_each_sg(table->sgl, sg_elem, table->nents, i) | 333 | for_each_sg(table->sgl, sg_elem, table->nents, i) |
| 334 | sg_set_buf(&sg[idx++], sg_virt(sg_elem), sg_elem->length); | 334 | sg[idx++] = *sg_elem; |
| 335 | 335 | ||
| 336 | *p_idx = idx; | 336 | *p_idx = idx; |
| 337 | } | 337 | } |