]> err.no Git - linux-2.6/commit
uml: more __init annotations
authorJeff Dike <jdike@addtoit.com>
Tue, 24 Jul 2007 01:43:48 +0000 (18:43 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 24 Jul 2007 19:24:58 +0000 (12:24 -0700)
commit97a1fcbb20fcbb0177567fd2dbcc6ed1bcc450ce
tree0331a8685599fbe23532bd69cd89ef82e4ed7806
parentda3e30e78ed9652322dccb49fa149e7b4e985f74
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>
arch/um/drivers/mconsole_kern.c
arch/um/drivers/net_kern.c
arch/um/kernel/mem.c
arch/um/kernel/physmem.c
arch/um/kernel/skas/process.c
arch/um/os-Linux/process.c