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

Commit 5a1cb47f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Jens Axboe
Browse files

m68k: sg fallout 



Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarJens Axboe <axboe@carl.home.kernel.dk>
parent d91c5e88

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)

drivers/scsi/atari_NCR5380.c

+2 −3
Original line number Diff line number Diff line
@@ -477,10 +477,9 @@ static void merge_contiguous_buffers(Scsi_Cmnd *cmd) 


	for (endaddr = virt_to_phys(cmd->SCp.ptr + cmd->SCp.this_residual - 1) + 1;

	     cmd->SCp.buffers_residual &&

	     virt_to_phys(page_address(cmd->SCp.buffer[1].page) +

			  cmd->SCp.buffer[1].offset) == endaddr;) {

	     virt_to_phys(sg_virt(&cmd->SCp.buffer[1])) == endaddr;) {

		MER_PRINTK("VTOP(%p) == %08lx -> merging\n",

			   page_address(cmd->SCp.buffer[1].page), endaddr);

			   page_address(sg_page(&cmd->SCp.buffer[1])), endaddr);

#if (NDEBUG & NDEBUG_MERGING)

		++cnt;

#endif

drivers/scsi/sun3x_esp.c

+2 −2
Original line number Diff line number Diff line
@@ -332,8 +332,8 @@ static void dma_mmu_get_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp) 
    struct scatterlist *sg = sp->SCp.buffer;



    while (sz >= 0) {

	    sg[sz].dma_address = dvma_map((unsigned long)page_address(sg[sz].page) +

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

	    sg[sz].dma_address = dvma_map((unsigned long)sg_virt(&sg[sz]),

					  sg[sz].length);

	    sz--;

    }

    sp->SCp.ptr=(char *)((unsigned long)sp->SCp.buffer->dma_address);

net/ieee80211/ieee80211_crypt_tkip.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <net/ieee80211.h>



#include <linux/crypto.h>

#include <asm/scatterlist.h>

#include <linux/scatterlist.h>

#include <linux/crc32.h>



MODULE_AUTHOR("Jouni Malinen");

net/ieee80211/ieee80211_crypt_wep.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <net/ieee80211.h>



#include <linux/crypto.h>

#include <asm/scatterlist.h>

#include <linux/scatterlist.h>

#include <linux/crc32.h>



MODULE_AUTHOR("Jouni Malinen");