X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fcris%2Farch-v32%2Fdrivers%2Fpci%2Fbios.c;h=24bc149889b6d00976ea3c0115546c0c5d2a1db0;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=a2b9c60c2777e6cf39b94b0789fccf15307ced19;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c
index a2b9c60c2..24bc14988 100644
--- 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;