From: Christoph Hellwig <hch@infradead.org> and David M-T
The ia64 port can use vmap(), but needs to be able to specify the protection
flags and the resulting vma's vm_flags.
The patch adds the two extra args to vmap(), updates the two callers and
fixes some comment spellos.
25-akpm/fs/xfs/pagebuf/page_buf.c | 3 ++-
25-akpm/include/linux/vmalloc.h | 3 ++-
25-akpm/mm/vmalloc.c | 29 ++++++++++++++++-------------
25-akpm/sound/core/sgbuf.c | 2 +-
4 files changed, 21 insertions(+), 16 deletions(-)
diff -puN fs/xfs/pagebuf/page_buf.c~vmap-extensions fs/xfs/pagebuf/page_buf.c
--- 25/fs/xfs/pagebuf/page_buf.c~vmap-extensions Thu Apr 17 16:04:09 2003
+++ 25-akpm/fs/xfs/pagebuf/page_buf.c Thu Apr 17 16:04:09 2003
@@ -554,7 +554,8 @@ mapit:
} else if (flags & PBF_MAPPED) {
if (as_list_len > 64)
purge_addresses();
- pb->pb_addr = vmap(pb->pb_pages, page_count);
+ pb->pb_addr = vmap(pb->pb_pages, page_count,
+ VM_MAP, PAGE_KERNEL);
if (pb->pb_addr == NULL)
return -ENOMEM;
pb->pb_addr += pb->pb_offset;
diff -puN include/linux/vmalloc.h~vmap-extensions include/linux/vmalloc.h
--- 25/include/linux/vmalloc.h~vmap-extensions Thu Apr 17 16:04:09 2003
+++ 25-akpm/include/linux/vmalloc.h Thu Apr 17 16:04:09 2003
@@ -27,7 +27,8 @@ extern void *vmalloc_32(unsigned long si
extern void *__vmalloc(unsigned long size, int gfp_mask, pgprot_t prot);
extern void vfree(void *addr);
-extern void *vmap(struct page **pages, unsigned int count);
+extern void *vmap(struct page **pages, unsigned int count,
+ unsigned long flags, pgprot_t prot);
extern void vunmap(void *addr);
/*
diff -puN mm/vmalloc.c~vmap-extensions mm/vmalloc.c
--- 25/mm/vmalloc.c~vmap-extensions Thu Apr 17 16:04:09 2003
+++ 25-akpm/mm/vmalloc.c Thu Apr 17 16:04:09 2003
@@ -308,7 +308,7 @@ void __vunmap(void *addr, int deallocate
*
* @addr: memory base address
*
- * Free the virtually continguos memory area starting at @addr, as
+ * Free the virtually contiguous memory area starting at @addr, as
* obtained from vmalloc(), vmalloc_32() or __vmalloc().
*
* May not be called in interrupt context.
@@ -324,7 +324,7 @@ void vfree(void *addr)
*
* @addr: memory base address
*
- * Free the virtually continguos memory area starting at @addr,
+ * Free the virtually contiguous memory area starting at @addr,
* which was created from the page array passed to vmap().
*
* May not be called in interrupt context.
@@ -336,25 +336,28 @@ void vunmap(void *addr)
}
/**
- * vmap - map an array of pages into virtually continguos space
+ * vmap - map an array of pages into virtually contiguous space
*
* @pages: array of page pointers
* @count: number of pages to map
+ * @flags: vm_area->flags
+ * @prot: page protection for the mapping
*
- * Maps @count pages from @pages into continguos kernel virtual
+ * Maps @count pages from @pages into contiguous kernel virtual
* space.
*/
-void *vmap(struct page **pages, unsigned int count)
+void *vmap(struct page **pages, unsigned int count,
+ unsigned long flags, pgprot_t prot)
{
struct vm_struct *area;
if (count > num_physpages)
return NULL;
- area = get_vm_area((count << PAGE_SHIFT), VM_MAP);
+ area = get_vm_area((count << PAGE_SHIFT), flags);
if (!area)
return NULL;
- if (map_vm_area(area, PAGE_KERNEL, &pages)) {
+ if (map_vm_area(area, prot, &pages)) {
vunmap(area->addr);
return NULL;
}
@@ -363,14 +366,14 @@ void *vmap(struct page **pages, unsigned
}
/**
- * __vmalloc - allocate virtually continguos memory
+ * __vmalloc - allocate virtually contiguous memory
*
* @size: allocation size
* @gfp_mask: flags for the page level allocator
* @prot: protection mask for the allocated pages
*
* Allocate enough pages to cover @size from the page level
- * allocator with @gfp_mask flags. Map them into continguos
+ * allocator with @gfp_mask flags. Map them into contiguous
* kernel virtual space, using a pagetable protection of @prot.
*/
void *__vmalloc(unsigned long size, int gfp_mask, pgprot_t prot)
@@ -418,12 +421,12 @@ fail:
}
/**
- * vmalloc - allocate virtually continguos memory
+ * vmalloc - allocate virtually contiguous memory
*
* @size: allocation size
*
* Allocate enough pages to cover @size from the page level
- * allocator and map them into continguos kernel virtual space.
+ * allocator and map them into contiguous kernel virtual space.
*
* For tight cotrol over page level allocator and protection flags
* use __vmalloc() instead.
@@ -434,12 +437,12 @@ void *vmalloc(unsigned long size)
}
/**
- * vmalloc_32 - allocate virtually continguos memory (32bit addressable)
+ * vmalloc_32 - allocate virtually contiguous memory (32bit addressable)
*
* @size: allocation size
*
* Allocate enough 32bit PA addressable pages to cover @size from the
- * page level allocator and map them into continguos kernel virtual space.
+ * page level allocator and map them into contiguous kernel virtual space.
*/
void *vmalloc_32(unsigned long size)
{
diff -puN sound/core/sgbuf.c~vmap-extensions sound/core/sgbuf.c
--- 25/sound/core/sgbuf.c~vmap-extensions Thu Apr 17 16:06:55 2003
+++ 25-akpm/sound/core/sgbuf.c Thu Apr 17 16:07:12 2003
@@ -85,7 +85,7 @@ void *snd_malloc_sgbuf_pages(struct pci_
}
sgbuf->size = size;
- dmab->area = vmap(sgbuf->page_table, sgbuf->pages);
+ dmab->area = vmap(sgbuf->page_table, sgbuf->pages, VM_MAP, PAGE_KERNEL);
if (! dmab->area)
goto _failed;
return dmab->area;
_