diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2016-03-02 19:37:30 +0100 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2016-03-02 19:37:30 +0100 |
| commit | 1120e8745ccd3e512fe2016c9e5092fcd378490a (patch) | |
| tree | 0e89ac6cd82c213a78d79d10d3fecff06f21127d /driver/kmem.c | |
| parent | 01e857cca352e73243d00b62a0c248a35cea6b71 (diff) | |
| download | pcitool-1120e8745ccd3e512fe2016c9e5092fcd378490a.tar.gz pcitool-1120e8745ccd3e512fe2016c9e5092fcd378490a.tar.bz2 pcitool-1120e8745ccd3e512fe2016c9e5092fcd378490a.tar.xz pcitool-1120e8745ccd3e512fe2016c9e5092fcd378490a.zip | |
Restructure driver headers
Diffstat (limited to 'driver/kmem.c')
| -rw-r--r-- | driver/kmem.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/driver/kmem.c b/driver/kmem.c index e3b0a97..47d1929 100644 --- a/driver/kmem.c +++ b/driver/kmem.c @@ -17,12 +17,7 @@ #include <linux/mm.h> #include <linux/pagemap.h> -#include "config.h" /* compile-time configuration */ -#include "compat.h" /* compatibility definitions for older linux */ -#include "pciDriver.h" /* external interface for the driver */ -#include "common.h" /* internal definitions for all parts */ -#include "kmem.h" /* prototypes for kernel memory */ -#include "sysfs.h" /* prototypes for sysfs */ +#include "base.h" /** @@ -628,9 +623,9 @@ int pcidriver_mmap_kmem(pcidriver_privdata_t *privdata, struct vm_area_struct *v page_to_pfn(virt_to_page((void*)kmem_entry->cpua))); if ((kmem_entry->type&PCILIB_KMEM_TYPE_MASK) == PCILIB_KMEM_TYPE_REGION) { - ret = remap_pfn_range_compat(vma, vma->vm_start, kmem_entry->dma_handle, (vma_size < kmem_entry->size)?vma_size:kmem_entry->size, vma->vm_page_prot); + ret = remap_pfn_range(vma, vma->vm_start, (kmem_entry->dma_handle >> PAGE_SHIFT), (vma_size < kmem_entry->size)?vma_size:kmem_entry->size, vma->vm_page_prot); } else { - ret = remap_pfn_range_cpua_compat(vma, vma->vm_start, kmem_entry->cpua, (vma_size < kmem_entry->size)?vma_size:kmem_entry->size, vma->vm_page_prot); + ret = remap_pfn_range(vma, vma->vm_start, page_to_pfn(virt_to_page((void*)(kmem_entry->cpua))), (vma_size < kmem_entry->size)?vma_size:kmem_entry->size, vma->vm_page_prot); } if (ret) { |