summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-20 06:12:47 +0100
committerOlof Johansson <olof@lixom.net>2011-12-20 06:12:53 +0100
commit4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a (patch)
tree0ac643f1a0c57a88452ef017c61d325fab98d00a /include
parentMerge branch 'davinci/features' into next/devel (diff)
parentARM: picoxcell: implement watchdog restart (diff)
downloadlinux-4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a.tar.xz
linux-4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a.zip
Merge branch 'picoxcell/devel' into next/devel
* picoxcell/devel: (1 commit) ARM: picoxcell: implement watchdog restart
Diffstat (limited to 'include')
-rw-r--r--include/linux/vmalloc.h1
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);
*/
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