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

Commit 8c8d7214 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe
Browse files

alpha: fix sg_page breakage 



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 35fc51e7

arch/alpha/kernel/pci-noop.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/scatterlist.h>





#include "proto.h"

#include "proto.h"
@@ -172,18 +173,19 @@ dma_alloc_coherent(struct device *dev, size_t size, 
EXPORT_SYMBOL(dma_alloc_coherent);

EXPORT_SYMBOL(dma_alloc_coherent);





int

int

dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,

dma_map_sg(struct device *dev, struct scatterlist *sgl, int nents,

	   enum dma_data_direction direction)

	   enum dma_data_direction direction)

{

{

	int i;

	int i;

	struct scatterlist *sg;





	for (i = 0; i < nents; i++ ) {

	for_each_sg(sgl, sg, nents, i) {

		void *va;

		void *va;





		BUG_ON(!sg[i].page);

		BUG_ON(!sg_page(sg));

		va = page_address(sg[i].page) + sg[i].offset;

		va = sg_virt(sg);

		sg_dma_address(sg + i) = (dma_addr_t)virt_to_bus(va);

		sg_dma_address(sg) = (dma_addr_t)virt_to_bus(va);

		sg_dma_len(sg + i) = sg[i].length;

		sg_dma_len(sg) = sg->length;

	}

	}





	return nents;

	return nents;