gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated kcalloc/kmalloc calls and enabled sdma_select_user_engine dependencies

Browse Source 
Conflicts:
	kernel/include/hfi1/ihk_hfi1_common.h
This commit is contained in:
Aram Santogidis
2017-08-03 18:23:29 +09:00
committed by Balazs Gerofi
parent b60a980088
commit fe4c461f2f
5 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/include/hfi1/sdma.h
View File

@@ -882,7 +882,7 @@ static inline int sdma_txadd_kvaddr(
return -ENOSPC;
}
#else
//TODO: dma_map_single
addr = virt_to_phys(kvaddr);
#endif /* __HFI1_ORIG__ */
return _sdma_txadd_daddr(
@@ -1038,6 +1038,7 @@ void sdma_engine_interrupt(struct sdma_engine *sde, u64 status);
*
*/
#endif /* __HFI1_ORIG__ */
/**
* struct sdma_map_elem - mapping for a vl
* @mask - selector mask
@@ -1067,12 +1068,17 @@ struct sdma_map_elem {
*/
struct sdma_vl_map {
s8 engine_to_vl[TXE_NUM_SDMA_ENGINES];
#ifdef __HFI1_ORIG__
struct rcu_head list;
#else
//TODO: struct rcu_head list;
#endif /* __HFI1_ORIG__ */
u32 mask;
u8 actual_vls;
u8 vls;
struct sdma_map_elem *map[0];
};
#ifdef __HFI1_ORIG__
int sdma_map_init(
struct hfi1_devdata *dd,