linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / cris / arch-v32 / drivers / pci / bios.c

diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c
index a2b9c60..24bc149 100644 (file)
--- a/arch/cris/arch-v32/drivers/pci/bios.c
+++ b/arch/cris/arch-v32/drivers/pci/bios.c
@@ -27,6 +27,8 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
        /* Leave vm_pgoff as-is, the PCI space address is the physical
         * address on this platform.
         */
+       vma->vm_flags |= (VM_SHM | VM_LOCKED | VM_IO);
+
        prot = pgprot_val(vma->vm_page_prot);
        vma->vm_page_prot = __pgprot(prot);
 
@@ -43,10 +45,10 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 
 void
 pcibios_align_resource(void *data, struct resource *res,
-                      resource_size_t size, resource_size_t align)
+                      unsigned long size, unsigned long align)
 {
        if (res->flags & IORESOURCE_IO) {
-               resource_size_t start = res->start;
+               unsigned long start = res->start;
 
                if (start & 0x300) {
                        start = (start + 0x3ff) & ~0x3ff;