upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / drivers / sbus / char / vfc_dev.c

diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index ad29b49..86ce541 100644 (file)
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -178,7 +178,7 @@ struct vfc_dev *vfc_get_dev_ptr(int instance)
        return vfc_dev_lst[instance];
 }
 
-static spinlock_t vfc_dev_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(vfc_dev_lock);
 
 static int vfc_open(struct inode *inode, struct file *file) 
 {
@@ -626,8 +626,10 @@ static int vfc_mmap(struct file *file, struct vm_area_struct *vma)
        vma->vm_flags |=
                (VM_SHM | VM_LOCKED | VM_IO | VM_MAYREAD | VM_MAYWRITE | VM_MAYSHARE);
        map_offset = (unsigned int) (long)dev->phys_regs;
-       ret = io_remap_page_range(vma, vma->vm_start, map_offset, map_size, 
-                                 vma->vm_page_prot, dev->which_io);
+       ret = io_remap_pfn_range(vma, vma->vm_start,
+                                 MK_IOSPACE_PFN(dev->which_io,
+                                       map_offset >> PAGE_SHIFT),
+                                 map_size, vma->vm_page_prot);
 
        if(ret)
                return -EAGAIN;