Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:54 +00:00
parent 742eaa6a6e 0af362f844
commit 73829af71f
96 changed files with 179 additions and 1406 deletions
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -131,6 +131,7 @@ extern long vwrite(char *buf, char *addr, unsigned long count);
 */
 extern rwlock_t vmlist_lock;
 extern struct vm_struct *vmlist;
+extern __init void vm_area_add_early(struct vm_struct *vm);
 extern __init void vm_area_register_early(struct vm_struct *vm, size_t align);

 #ifdef CONFIG_SMP