diff options
author | Olof Johansson <olof@lixom.net> | 2011-12-19 21:12:24 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-19 21:13:41 -0800 |
commit | 844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (patch) | |
tree | fdfe4de420c66517a2e4a2a25a454997c6210e95 /include/linux | |
parent | 5ecdd39f6cdd57aa42e072bf30aa7239fd109d7a (diff) | |
parent | a53bfa07369b7c3448a60d29f0fc2e81751ed0b7 (diff) | |
download | linux-stable-844e8a16f25568eefd02a6bfb40bdd9bc04704b8.tar.gz linux-stable-844e8a16f25568eefd02a6bfb40bdd9bc04704b8.tar.bz2 linux-stable-844e8a16f25568eefd02a6bfb40bdd9bc04704b8.zip |
Merge branch 'picoxcell/cleanup' into next/cleanup
* picoxcell/cleanup: (4 commits)
MAINTAINERS: add maintainer entry for Picochip picoxcell
ARM: picoxcell: move io mappings to common.c
ARM: picoxcell: don't reserve irq_descs
ARM: picoxcell: remove mach/memory.h
Conflicts:
arch/arm/mach-at91/setup.c
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); */ 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 |