/alps/pcitool

To get this branch, use:
bzr branch http://suren.me/webbzr/alps/pcitool

« back to all changes in this revision

Viewing changes to driver/kmem.c

  • Committer: Suren A. Chilingaryan
  • Date: 2016-03-02 18:37:30 UTC
  • Revision ID: csa@suren.me-20160302183730-nlrgi7h3yuizcizc
Restructure driver headers

Show diffs side-by-side

added added

removed removed

Lines of Context:
driver/kmem.c
17
17
#include <linux/mm.h>
18
18
#include <linux/pagemap.h>
19
19
 
20
 
#include "config.h"                     /* compile-time configuration */
21
 
#include "compat.h"                     /* compatibility definitions for older linux */
22
 
#include "pciDriver.h"                  /* external interface for the driver */
23
 
#include "common.h"                     /* internal definitions for all parts */
24
 
#include "kmem.h"                       /* prototypes for kernel memory */
25
 
#include "sysfs.h"                      /* prototypes for sysfs */
 
20
#include "base.h"
26
21
 
27
22
 
28
23
/**
628
623
                 page_to_pfn(virt_to_page((void*)kmem_entry->cpua)));
629
624
 
630
625
    if ((kmem_entry->type&PCILIB_KMEM_TYPE_MASK) == PCILIB_KMEM_TYPE_REGION) {
631
 
        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);
 
626
        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);
632
627
    } else {
633
 
        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);
 
628
        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);
634
629
    }
635
630
 
636
631
    if (ret) {