diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-07-12 12:57:19 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-07-12 12:57:19 +0000 |
| commit | 5c22c7d7c47b830c1fc1102ef7447261c6a7be39 (patch) | |
| tree | 64b6cc69ad67ec306fc64aa4e65ce0b86c9dbf38 /zttranscode.c | |
| parent | 6b8045bf01673d2ffffcad80c0975ead4b8a2fc7 (diff) | |
use mmap API that is present in kernels < 2.6.10 when needed
fix address assignment for mmap in more recent kernels
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1219 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'zttranscode.c')
| -rw-r--r-- | zttranscode.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/zttranscode.c b/zttranscode.c index 08fac66..207b561 100644 --- a/zttranscode.c +++ b/zttranscode.c @@ -351,6 +351,7 @@ static int zt_tc_mmap(struct file *file, struct vm_area_struct *vma) { struct zt_transcoder_channel *ztc = file->private_data; unsigned long physical; + int res; if (!ztc) return -EINVAL; @@ -369,7 +370,12 @@ static int zt_tc_mmap(struct file *file, struct vm_area_struct *vma) } physical = (unsigned long) virt_to_phys(ztc->tch); - if (remap_pfn_range(vma, vma->vm_start, physical >> PAGE_SHIFT, sizeof(struct zt_transcode_header), PAGE_SHARED)) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) + res = remap_pfn_range(vma, vma->vm_start, physical, sizeof(struct zt_transcode_header), PAGE_SHARED); +#else + res = remap_page_range(vma, vma->vm_start, physical >> PAGE_SHIFT, sizeof(struct zt_transcode_header), PAGE_SHARED); +#endif + if (res) { if (debug) printk("zttranscode: remap failed!\n"); return -EAGAIN; |