diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-07-23 18:43:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 12:24:58 -0700 |
| commit | 97a1fcbb20fcbb0177567fd2dbcc6ed1bcc450ce (patch) | |
| tree | 0331a8685599fbe23532bd69cd89ef82e4ed7806 /arch/um/os-Linux/process.c | |
| parent | da3e30e78ed9652322dccb49fa149e7b4e985f74 (diff) | |
| download | kernel_samsung_smdk4412-97a1fcbb20fcbb0177567fd2dbcc6ed1bcc450ce.tar.gz kernel_samsung_smdk4412-97a1fcbb20fcbb0177567fd2dbcc6ed1bcc450ce.tar.bz2 kernel_samsung_smdk4412-97a1fcbb20fcbb0177567fd2dbcc6ed1bcc450ce.zip | |
uml: more __init annotations
2.6.23-rc1 turned up another batch of references from non-__init code to
__init code. In most cases, these were missing __init annotations. In one
case (os_drop_memory), the annotation was present but wrong.
init_maps is __init, but for some reason was being very careful about the
mechanism by which it allocated memory, checking whether it was OK to use
kmalloc (at this point in the boot, it definitely isn't) and using either
alloc_bootmem_low_pages or kmalloc/vmalloc. So, the kmalloc/vmalloc code is
removed.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/os-Linux/process.c')
| -rw-r--r-- | arch/um/os-Linux/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c index 2d9d2ca3929..e9c14329751 100644 --- a/arch/um/os-Linux/process.c +++ b/arch/um/os-Linux/process.c @@ -194,7 +194,7 @@ int os_unmap_memory(void *addr, int len) #define MADV_REMOVE KERNEL_MADV_REMOVE #endif -int __init os_drop_memory(void *addr, int length) +int os_drop_memory(void *addr, int length) { int err; |