diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-16 17:50:01 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-16 17:50:01 -0500 |
| commit | b94ee062b5b41c7fc0e44309e8546d4694e75007 (patch) | |
| tree | 2ba08003be8d25a573c17a00a627b424de4bb2e4 /include/linux | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| parent | 3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/boards
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/vmalloc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 4bde182fcf93..dcdfc2bda922 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h | |||
| @@ -131,6 +131,7 @@ extern long vwrite(char *buf, char *addr, unsigned long count); | |||
| 131 | */ | 131 | */ |
| 132 | extern rwlock_t vmlist_lock; | 132 | extern rwlock_t vmlist_lock; |
| 133 | extern struct vm_struct *vmlist; | 133 | extern struct vm_struct *vmlist; |
| 134 | extern __init void vm_area_add_early(struct vm_struct *vm); | ||
| 134 | extern __init void vm_area_register_early(struct vm_struct *vm, size_t align); | 135 | extern __init void vm_area_register_early(struct vm_struct *vm, size_t align); |
| 135 | 136 | ||
| 136 | #ifdef CONFIG_SMP | 137 | #ifdef CONFIG_SMP |