aboutsummaryrefslogtreecommitdiff
path: root/mm/vmalloc.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-02-24 11:57:21 +0900
committerTejun Heo <tj@kernel.org>2009-02-24 11:57:21 +0900
commitc0c0a29379b5848aec2e8f1c58d853d3cb7118b8 (patch)
tree521d4c8ae5756652e7ed3f7242c516b79df76aa2 /mm/vmalloc.c
parent2d0aae41695257603fc281b519677131ab5a752b (diff)
downloadlinux-linaro-android-c0c0a29379b5848aec2e8f1c58d853d3cb7118b8.tar.gz
vmalloc: add @align to vm_area_register_early()
Impact: allow larger alignment for early vmalloc area allocation Some early vmalloc users might want larger alignment, for example, for custom large page mapping. Add @align to vm_area_register_early(). While at it, drop docbook comment on non-existent @size. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Diffstat (limited to 'mm/vmalloc.c')
-rw-r--r--mm/vmalloc.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 224eca9650a..366ae9ea6af 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -995,7 +995,7 @@ EXPORT_SYMBOL(vm_map_ram);
/**
* vm_area_register_early - register vmap area early during boot
* @vm: vm_struct to register
- * @size: size of area to register
+ * @align: requested alignment
*
* This function is used to register kernel vm area before
* vmalloc_init() is called. @vm->size and @vm->flags should contain
@@ -1004,12 +1004,15 @@ EXPORT_SYMBOL(vm_map_ram);
*
* DO NOT USE THIS FUNCTION UNLESS YOU KNOW WHAT YOU'RE DOING.
*/
-void __init vm_area_register_early(struct vm_struct *vm)
+void __init vm_area_register_early(struct vm_struct *vm, size_t align)
{
static size_t vm_init_off __initdata;
+ unsigned long addr;
+
+ addr = ALIGN(VMALLOC_START + vm_init_off, align);
+ vm_init_off = PFN_ALIGN(addr + vm->size) - VMALLOC_START;
- vm->addr = (void *)VMALLOC_START + vm_init_off;
- vm_init_off = PFN_ALIGN(vm_init_off + vm->size);
+ vm->addr = (void *)addr;
vm->next = vmlist;
vmlist = vm;