3 files changed, 8 insertions, 11 deletions

diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
index 81a4342d5a3f..d8f9b7e89234 100644
--- a/arch/alpha/include/asm/pgtable.h
+++ b/arch/alpha/include/asm/pgtable.h
@@ -354,9 +354,6 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
 #define kern_addr_valid(addr)   (1)
 #endif
 
-#define io_remap_pfn_range(vma, start, pfn, size, prot) \
-                remap_pfn_range(vma, start, pfn, size, prot)
-
 #define pte_ERROR(e) \
         printk("%s:%d: bad pte %016lx.\n", __FILE__, __LINE__, pte_val(e))
 #define pmd_ERROR(e) \
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index b9e37ad6fa19..1402fcc11c2c 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -96,6 +96,7 @@ struct osf_dirent {
 };
 
 struct osf_dirent_callback {
+        struct dir_context ctx;
         struct osf_dirent __user *dirent;
         long __user *basep;
         unsigned int count;
@@ -146,17 +147,17 @@ SYSCALL_DEFINE4(osf_getdirentries, unsigned int, fd,
 {
         int error;
         struct fd arg = fdget(fd);
-        struct osf_dirent_callback buf;
+        struct osf_dirent_callback buf = {
+                .ctx.actor = osf_filldir,
+                .dirent = dirent,
+                .basep = basep,
+                .count = count
+        };
 
         if (!arg.file)
                 return -EBADF;
 
-        buf.dirent = dirent;
-        buf.basep = basep;
-        buf.count = count;
-        buf.error = 0;
-
-        error = vfs_readdir(arg.file, osf_filldir, &buf);
+        error = iterate_dir(arg.file, &buf.ctx);
         if (error >= 0)
                 error = buf.error;
         if (count != buf.count)
diff --git a/arch/alpha/kernel/pci-sysfs.c b/arch/alpha/kernel/pci-sysfs.c
index b51f7b4818cd..2b183b0d3207 100644
--- a/arch/alpha/kernel/pci-sysfs.c
+++ b/arch/alpha/kernel/pci-sysfs.c
@@ -26,7 +26,6 @@ static int hose_mmap_page_range(struct pci_controller *hose,
                 base = sparse ? hose->sparse_io_base : hose->dense_io_base;
 
         vma->vm_pgoff += base >> PAGE_SHIFT;
-        vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
 
         return io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
                                   vma->vm_end - vma->vm_start,