FPGA/riffa
1
0
Fork 0
mirror of https://github.com/KastnerRG/riffa.git synced 2025-01-30 23:02:54 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14 from marzoul/linux46

Browse Source 
Fix driver compilation under linux >= 4.6
This commit is contained in:
Dustin Richmond 2016-08-11 16:29:56 -07:00 committed by GitHub
commit 014140324a
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
driver/linux/riffa_driver.c
View File

@ -441,7 +441,11 @@ static inline struct sg_mapping * fill_sg_buf(struct fpga_state * sc, int chnl,
// Page in the user pages.
down_read(&current->mm->mmap_sem);
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
num_pages = get_user_pages(current, current->mm, udata, num_pages_reqd, 1, 0, pages, NULL);
#else
num_pages = get_user_pages(udata, num_pages_reqd, 1, 0, pages, NULL);
#endif
up_read(&current->mm->mmap_sem);
if (num_pages <= 0) {
printk(KERN_ERR "riffa: fpga:%d chnl:%d, %s unable to pin any pages in memory\n", sc->id, chnl, dir);
@ -454,7 +458,11 @@ static inline struct sg_mapping * fill_sg_buf(struct fpga_state * sc, int chnl,
if ((sgl = kcalloc(num_pages, sizeof(*sgl), GFP_KERNEL)) == NULL) {
printk(KERN_ERR "riffa: fpga:%d chnl:%d, %s could not allocate memory for scatterlist array\n", sc->id, chnl, dir);
for (i = 0; i < num_pages; ++i)
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
page_cache_release(pages[i]);
#else
put_page(pages[i]);
#endif
kfree(pages);
kfree(sg_map);
return NULL;
@ -522,12 +530,20 @@ static inline void free_sg_buf(struct fpga_state * sc, struct sg_mapping * sg_ma
for (i = 0; i < sg_map->num_pages; ++i) {
if (!PageReserved(sg_map->pages[i]))
SetPageDirty(sg_map->pages[i]);
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
page_cache_release(sg_map->pages[i]);
#else
put_page(sg_map->pages[i]);
#endif
}
}
else {
for (i = 0; i < sg_map->num_pages; ++i) {
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
page_cache_release(sg_map->pages[i]);
#else
put_page(sg_map->pages[i]);
#endif
}
}
}