remove

diff --git a/comedi/kvmem.c b/comedi/kvmem.c
deleted file mode 100644 (file)
index 4f345a5..0000000
--- a/comedi/kvmem.c
+++ /dev/null
@@ -1,98 +0,0 @@
-
-#include <linux/kernel.h>
-#include <linux/config.h>
-#include <linux/vmalloc.h>
-#include "kvmem.h"
-
-/* allocate user space mmapable block of memory in the kernel space */
-void * rvmalloc(unsigned long size)
-{
-       void * mem;
-       unsigned long adr, page;
-        
-#if LINUX_VERSION_CODE < 0x020300
-       mem=vmalloc(size);
-#else
-       mem=vmalloc_32(size);
-#endif
-       if (mem) 
-       {
-               memset(mem, 0, size); /* Clear the ram out, no junk to the user */
-               adr=(unsigned long) mem;
-               while (size > 0) 
-                {
-#if LINUX_VERSION_CODE < 0x020300
-                       page = kvirt_to_phys(adr);
-                       mem_map_reserve(MAP_NR(phys_to_virt(page)));
-#else
-                       page = kvirt_to_pa(adr);
-                       mem_map_reserve(virt_to_page(__va(page)));
-#endif
-                       adr+=PAGE_SIZE;
-                       size-=PAGE_SIZE;
-               }
-       }
-       return mem;
-}
-
-void rvfree(void * mem, unsigned long size)
-{
-        unsigned long adr, page;
-        
-       if (mem) 
-       {
-               adr=(unsigned long) mem;
-               while (size > 0) 
-                {
-#if LINUX_VERSION_CODE < 0x020300
-                       page = kvirt_to_phys(adr);
-                       mem_map_unreserve(MAP_NR(phys_to_virt(page)));
-#else
-                       page = kvirt_to_pa(adr);
-                       mem_map_unreserve(virt_to_page(__va(page)));
-#endif
-                       adr+=PAGE_SIZE;
-                       size-=PAGE_SIZE;
-               }
-               vfree(mem);
-       }
-}
-
-/* this function will map (fragment of) rvmalloc'ed memory area to user space */
-int rvmmap(void *mem, unsigned memsize, struct vm_area_struct *vma) {
-       unsigned long pos, size, start=vma->vm_start;
-#if LINUX_VERSION_CODE < 0x20300
-       unsigned long offset = vma->vm_offset;
-#else
-       unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
-#endif
-       /* this is not time critical code, so we check the arguments */
-       /* vma->vm_offset HAS to be checked (and is checked)*/
-       if (offset<0)
-               return -EFAULT;
-       size = vma->vm_end - vma->vm_start;
-       if (size + offset > memsize)
-               return -EFAULT;
-       pos = (unsigned long) mem + offset;
-       if (pos%PAGE_SIZE || start%PAGE_SIZE || size%PAGE_SIZE)
-               return -EFAULT;
-               
-       while (size>0) {
-#if LINUX_VERSION_CODE < 0x020300
-               if (remap_page_range(start,kvirt_to_phys(pos), PAGE_SIZE, 
-                       vma->vm_page_prot )) {
-                       /* FIXME: what should we do here to unmap previous pages ?*/
-                       printk(KERN_ERR "rvmmap failed: vm_start=0x%lx, vm_end=0x%lx, size=0x%lx, pos=0x%lx; please report to motyl@stan.chemie.unibas.ch\n",vma->vm_start,vma->vm_end,size,pos);
-                       return -EFAULT;
-               }
-#else
-               if (remap_page_range(start, kvirt_to_pa(pos),
-                   PAGE_SIZE, PAGE_SHARED))
-                       return -EAGAIN;
-#endif
-               pos+=PAGE_SIZE;
-               start+=PAGE_SIZE;
-               size-=PAGE_SIZE;
-       }
-       return 0;
-}

diff --git a/comedi/kvmem.h b/comedi/kvmem.h
deleted file mode 100644 (file)
index 2147b81..0000000
--- a/comedi/kvmem.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************/
-/* Memory management functions */
-/*******************************/
-
-#ifndef _KVMEM_H
-#define _KVMEM_H
-#include <linux/version.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#include <linux/highmem.h>  /* for SuSE brokenness */
-#include <linux/wrapper.h>
-#include <asm/pgtable.h>
-#include <asm/io.h>
-
-/* convert virtual user memory address to physical address */
-/* (virt_to_phys only works for kmalloced kernel memory) */
-
-#if LINUX_VERSION_CODE < 0x020300
-static inline unsigned long uvirt_to_phys(unsigned long adr)
-{
-       pgd_t *pgd;
-       pmd_t *pmd;
-       pte_t *ptep, pte;
-  
-       pgd = pgd_offset(current->mm, adr);
-       if (pgd_none(*pgd))
-               return 0;
-       pmd = pmd_offset(pgd, adr);
-       if (pmd_none(*pmd))
-               return 0;
-       ptep = pte_offset(pmd, adr/*&(~PGDIR_MASK)*/);
-       pte = *ptep;
-       if(pte_present(pte))
-               return virt_to_phys((void *)(pte_page(pte)|(adr&(PAGE_SIZE-1))));
-       return 0;
-}
-
-static inline unsigned long uvirt_to_bus(unsigned long adr) 
-{
-       return virt_to_bus(phys_to_virt(uvirt_to_phys(adr)));
-}
-
-/* convert virtual kernel memory address to physical address */
-/* (virt_to_phys only works for kmalloced kernel memory) */
-
-static inline unsigned long kvirt_to_phys(unsigned long adr) 
-{
-       return uvirt_to_phys(VMALLOC_VMADDR(adr));
-}
-
-static inline unsigned long kvirt_to_bus(unsigned long adr) 
-{
-       return uvirt_to_bus(VMALLOC_VMADDR(adr));
-}
-
-#else
-
-static inline unsigned long uvirt_to_kva(pgd_t *pgd, unsigned long adr)
-{
-       unsigned long ret = 0UL;
-       pmd_t *pmd;
-       pte_t *ptep, pte;
-
-       if(!pgd_none(*pgd)) {
-               pmd = pmd_offset(pgd, adr);
-               if (!pmd_none(*pmd)) {
-                       ptep = pte_offset(pmd, adr);
-                       pte = *ptep;
-                       if(pte_present(pte)){
-                               ret = (unsigned long) page_address(pte_page(pte));
-                               ret |= (adr&(PAGE_SIZE-1));
-                       }
-               }
-       }
-       return ret;
-}
-
-static inline unsigned long uvirt_to_bus(unsigned long adr)
-{
-       unsigned long kva, ret;
-
-       kva = uvirt_to_kva(pgd_offset(current->mm, adr), adr);
-       ret = virt_to_bus((void *)kva);
-
-       return ret;
-}
-
-static inline unsigned long kvirt_to_bus(unsigned long adr)
-{
-       unsigned long va, kva, ret;
-
-       va = VMALLOC_VMADDR(adr);
-       kva = uvirt_to_kva(pgd_offset_k(va), va);
-       ret = virt_to_bus((void *)kva);
-
-       return ret;
-}
-
-static inline unsigned long kvirt_to_pa(unsigned long adr)
-{
-       unsigned long va, kva, ret;
-
-       va = VMALLOC_VMADDR(adr);
-       kva = uvirt_to_kva(pgd_offset_k(va), va);
-       ret = __pa(kva);
-
-       return ret;
-}
-
-
-#endif
-
-
-extern void * rvmalloc(unsigned long size);
-extern void rvfree(void * mem, unsigned long size);
-extern int rvmmap(void *mem, unsigned memsize, struct vm_area_struct *vma);
-#endif