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

5
kernel/user_sdma.c
View File

@@ -583,7 +583,7 @@ int hfi1_user_sdma_process_request(void *private_data, struct iovec *iovec,
}
}
dkprintf("%s: hfi1_kregbase: 0x%lx -> 0x%lx:%lu\n",
kprintf("%s: hfi1_kregbase: 0x%lx -> 0x%lx:%lu\n",
__FUNCTION__,
hfi1_kregbase, (phys - TXE_PIO_SEND), TXE_PIO_SEND);
}
@@ -997,11 +997,10 @@ static int user_sdma_send_pkts(struct user_sdma_request *req, unsigned maxpkts)
set_bit(SDMA_REQ_DONE_ERROR, &req->flags);
return -EFAULT;
}
//TODO: kmem_cache_alloc
#ifdef __HFI1_ORIG__
tx = kmem_cache_alloc(pq->txreq_cache, GFP_KERNEL);
#else
tx = kmalloc(sizeof(struct user_sdma_txreq), GFP_KERNEL | __GFP_ZERO);
tx = kmalloc(sizeof(struct user_sdma_txreq), GFP_KERNEL);
#endif /* __HFI1_ORIG__ */
if (!tx)
return -ENOMEM;