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

Commit 7f149574 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:
  fix sg_phys to use dma_addr_t
  ub: add sg_init_table for sense and read capacity commands
  x86: pci-gart fix
  blackfin: fix sg fallout
  xtensa: dma-mapping.h is using linux/scatterlist.h functions, so include it
  SG: audit of drivers that use blk_rq_map_sg()
  arch/um/drivers/ubd_kern.c: fix a building error
  SG: Change sg_set_page() to take length and offset argument
  AVR32: Fix sg_page breakage
  mmc: sg fallout
  m68k: sg fallout
  More SG build fixes
  sg: add missing sg_init_table calls to zfcp
  SG build fix
parents 2c750557 85cdffcd

arch/blackfin/kernel/dma-mapping.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/device.h>

#include <linux/dma-mapping.h>

#include <linux/io.h>

#include <linux/scatterlist.h>

#include <asm/cacheflush.h>

#include <asm/bfin-global.h>

arch/m68k/kernel/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ 
#include <linux/dma-mapping.h>

#include <linux/device.h>

#include <linux/kernel.h>

#include <linux/scatterlist.h>

#include <linux/vmalloc.h>



#include <asm/pgalloc.h>

#include <asm/scatterlist.h>



void *dma_alloc_coherent(struct device *dev, size_t size,

			 dma_addr_t *handle, gfp_t flag)

arch/sparc64/kernel/iommu_common.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ unsigned long prepare_sg(struct scatterlist *sg, int nents) 
	dma_sg->dma_length = dent_len;



	if (dma_sg != sg) {

		dma_sg = next_sg(dma_sg);

		dma_sg = sg_next(dma_sg);

		dma_sg->dma_length = 0;

	}

arch/sparc64/kernel/ldc.c

+1 −1
Original line number Diff line number Diff line
@@ -2121,7 +2121,7 @@ int ldc_map_sg(struct ldc_channel *lp, 
	state.nc = 0;



	for (i = 0; i < num_sg; i++)

		fill_cookies(&state, page_to_pfn(sg[i].page) << PAGE_SHIFT,

		fill_cookies(&state, page_to_pfn(sg_page(&sg[i])) << PAGE_SHIFT,

			     sg[i].offset, sg[i].length);



	return state.nc;

arch/um/drivers/ubd_kern.c

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "linux/genhd.h"

#include "linux/spinlock.h"

#include "linux/platform_device.h"

#include "linux/scatterlist.h"

#include "asm/segment.h"

#include "asm/uaccess.h"

#include "asm/irq.h"
@@ -704,6 +705,7 @@ static int ubd_add(int n, char **error_out) 
	ubd_dev->size = ROUND_BLOCK(ubd_dev->size);



	INIT_LIST_HEAD(&ubd_dev->restart);

	sg_init_table(&ubd_dev->sg, MAX_SG);



	err = -ENOMEM;

	ubd_dev->queue = blk_init_queue(do_ubd_request, &ubd_dev->lock);