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/kernel/skas | |
| parent | da3e30e78ed9652322dccb49fa149e7b4e985f74 (diff) | |
| download | talos-op-linux-97a1fcbb20fcbb0177567fd2dbcc6ed1bcc450ce.tar.gz talos-op-linux-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/kernel/skas')
| -rw-r--r-- | arch/um/kernel/skas/process.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c index 2a69a7ce5792..48051a98525f 100644 --- a/arch/um/kernel/skas/process.c +++ b/arch/um/kernel/skas/process.c @@ -145,7 +145,7 @@ void init_idle_skas(void) extern void start_kernel(void); -static int start_kernel_proc(void *unused) +static int __init start_kernel_proc(void *unused) { int pid; @@ -165,7 +165,7 @@ extern int userspace_pid[]; extern char cpu0_irqstack[]; -int start_uml_skas(void) +int __init start_uml_skas(void) { stack_protections((unsigned long) &cpu0_irqstack); set_sigstack(cpu0_irqstack, THREAD_SIZE); |
