Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20dc9f01 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block 

* 'sg' of git://git.kernel.dk/linux-2.6-block:
  Correction of "Update drivers to use sg helpers" patch for IMXMMC driver
  sg_init_table() should use unsigned loop index variable
  sg_last() should use unsigned loop index variable
  Initialise scatter/gather list in sg driver
  Initialise scatter/gather list in ata_sg_setup
  x86: fix pci-gart failure handling
  SG: s390-scsi: missing size parameter in zfcp_address_to_sg()
  SG: clear termination bit in sg_chain()
parents 93400708 e1efa2a3

arch/x86/kernel/pci-gart_64.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static int gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, 


error:

	flush_gart();

	gart_unmap_sg(dev, sg, nents, dir);

	gart_unmap_sg(dev, sg, out, dir);

	/* When it was forced or merged try again in a dumb way */

	if (force_iommu || iommu_merge) {

		out = dma_map_sg_nonforce(dev, sg, nents, dir);

drivers/ata/libata-core.c

+1 −0
Original line number Diff line number Diff line
@@ -4689,6 +4689,7 @@ static int ata_sg_setup(struct ata_queued_cmd *qc) 
		 * data in this function or read data in ata_sg_clean.

		 */

		offset = lsg->offset + lsg->length - qc->pad_len;

		sg_init_table(psg, 1);

		sg_set_page(psg, nth_page(sg_page(lsg), offset >> PAGE_SHIFT),

				qc->pad_len, offset_in_page(offset));

drivers/mmc/host/imxmmc.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static void imxmci_setup_data(struct imxmci_host *host, struct mmc_data *data) 
		}



		/* Convert back to virtual address */

		host->data_ptr = (u16*)sg_virt(sg);

		host->data_ptr = (u16*)sg_virt(data->sg);

		host->data_cnt = 0;



		clear_bit(IMXMCI_PEND_DMA_DATA_b, &host->pending_events);

drivers/s390/scsi/zfcp_def.h

+3 −2
Original line number Diff line number Diff line
@@ -70,11 +70,12 @@ zfcp_sg_to_address(struct scatterlist *list) 
 * zfcp_address_to_sg - set up struct scatterlist from kernel address

 * @address: kernel address

 * @list: struct scatterlist

 * @size: buffer size

 */

static inline void

zfcp_address_to_sg(void *address, struct scatterlist *list)

zfcp_address_to_sg(void *address, struct scatterlist *list, unsigned int size)

{

	sg_set_buf(list, address, 0);

	sg_set_buf(list, address, size);

}



#define REQUEST_LIST_SIZE 128

drivers/scsi/sg.c

+1 −0
Original line number Diff line number Diff line
@@ -1652,6 +1652,7 @@ sg_build_sgat(Sg_scatter_hold * schp, const Sg_fd * sfp, int tablesize) 
	schp->buffer = kzalloc(sg_bufflen, gfp_flags);

	if (!schp->buffer)

		return -ENOMEM;

	sg_init_table(schp->buffer, tablesize);

	schp->sglist_len = sg_bufflen;

	return tablesize;	/* number of scat_gath elements allocated */

}