diff options
author | Tejun Heo <tj@kernel.org> | 2009-02-23 21:57:21 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-02-23 21:57:21 -0500 |
commit | c0c0a29379b5848aec2e8f1c58d853d3cb7118b8 (patch) | |
tree | 521d4c8ae5756652e7ed3f7242c516b79df76aa2 /mm/vmalloc.c | |
parent | 2d0aae41695257603fc281b519677131ab5a752b (diff) |
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.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 224eca9650a8..366ae9ea6af2 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
@@ -995,7 +995,7 @@ EXPORT_SYMBOL(vm_map_ram); | |||
995 | /** | 995 | /** |
996 | * vm_area_register_early - register vmap area early during boot | 996 | * vm_area_register_early - register vmap area early during boot |
997 | * @vm: vm_struct to register | 997 | * @vm: vm_struct to register |
998 | * @size: size of area to register | 998 | * @align: requested alignment |
999 | * | 999 | * |
1000 | * This function is used to register kernel vm area before | 1000 | * This function is used to register kernel vm area before |
1001 | * vmalloc_init() is called. @vm->size and @vm->flags should contain | 1001 | * vmalloc_init() is called. @vm->size and @vm->flags should contain |
@@ -1004,12 +1004,15 @@ EXPORT_SYMBOL(vm_map_ram); | |||
1004 | * | 1004 | * |
1005 | * DO NOT USE THIS FUNCTION UNLESS YOU KNOW WHAT YOU'RE DOING. | 1005 | * DO NOT USE THIS FUNCTION UNLESS YOU KNOW WHAT YOU'RE DOING. |
1006 | */ | 1006 | */ |
1007 | void __init vm_area_register_early(struct vm_struct *vm) | 1007 | void __init vm_area_register_early(struct vm_struct *vm, size_t align) |
1008 | { | 1008 | { |
1009 | static size_t vm_init_off __initdata; | 1009 | static size_t vm_init_off __initdata; |
1010 | unsigned long addr; | ||
1011 | |||
1012 | addr = ALIGN(VMALLOC_START + vm_init_off, align); | ||
1013 | vm_init_off = PFN_ALIGN(addr + vm->size) - VMALLOC_START; | ||
1010 | 1014 | ||
1011 | vm->addr = (void *)VMALLOC_START + vm_init_off; | 1015 | vm->addr = (void *)addr; |
1012 | vm_init_off = PFN_ALIGN(vm_init_off + vm->size); | ||
1013 | 1016 | ||
1014 | vm->next = vmlist; | 1017 | vm->next = vmlist; |
1015 | vmlist = vm; | 1018 | vmlist = vm; |