Implemented a replacement for sdma_txadd_page()

Conflicts:
	kernel/user_sdma.c
This commit is contained in:
Aram Santogidis
2017-08-14 17:14:53 +09:00
committed by Balazs Gerofi
parent 99c216d91e
commit ae368d97d4
3 changed files with 58 additions and 18 deletions

View File

@@ -736,6 +736,7 @@ static inline int _sdma_txadd_daddr(
return rval;
}
#ifdef __HFI1_ORIG__
/**
* sdma_txadd_page() - add a page to the sdma_txreq
* @dd: the device to use for mapping
@@ -769,7 +770,6 @@ static inline int sdma_txadd_page(
return rval;
}
#ifdef __HFI1_ORIG__
addr = dma_map_page(
&dd->pcidev->dev,
page,
@@ -781,14 +781,12 @@ static inline int sdma_txadd_page(
__sdma_txclean(dd, tx);
return -ENOSPC;
}
#else
//TODO: dma_map_page
#endif /* __HFI1_ORIG__ */
hfi1_cdbg(AIOWRITE, "-");
return _sdma_txadd_daddr(
dd, SDMA_MAP_PAGE, tx, addr, len);
}
#endif /* __HFI1_ORIG__ */
/**
* sdma_txadd_daddr() - add a dma address to the sdma_txreq