Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97a1fcbb authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

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: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent da3e30e7

arch/um/drivers/mconsole_kern.c

+2 −2
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ static struct mc_device mem_mc = { 
	.remove		= mem_remove,

};



static int mem_mc_init(void)

static int __init mem_mc_init(void)

{

	if(can_drop_memory())

		mconsole_register_dev(&mem_mc);
@@ -798,7 +798,7 @@ void mconsole_stack(struct mc_request *req) 
 */

static char *notify_socket = NULL;



static int mconsole_init(void)

static int __init mconsole_init(void)

{

	/* long to avoid size mismatch warnings from gcc */

	long sock;

arch/um/drivers/net_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static int eth_setup_common(char *str, int index) 
	return found;

}



static int eth_setup(char *str)

static int __init eth_setup(char *str)

{

	struct eth_init *new;

	char *error;

arch/um/kernel/mem.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static void setup_highmem(unsigned long highmem_start, 
}

#endif



void mem_init(void)

void __init mem_init(void)

{

	/* clear the zero-page */

	memset((void *) empty_zero_page, 0, PAGE_SIZE);

arch/um/kernel/physmem.c

+5 −10
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ unsigned long high_physmem; 


extern unsigned long long physmem_size;



int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem)

int __init init_maps(unsigned long physmem, unsigned long iomem,

		     unsigned long highmem)

{

	struct page *p, *map;

	unsigned long phys_len, phys_pages, highmem_len, highmem_pages;
@@ -47,13 +48,7 @@ int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem) 
	total_pages = phys_pages + iomem_pages + highmem_pages;

	total_len = phys_len + iomem_len + highmem_len;



	if(kmalloc_ok){

		map = kmalloc(total_len, GFP_KERNEL);

		if(map == NULL)

			map = vmalloc(total_len);

	}

	else map = alloc_bootmem_low_pages(total_len);



	map = alloc_bootmem_low_pages(total_len);

	if(map == NULL)

		return -ENOMEM;
@@ -98,7 +93,7 @@ void map_memory(unsigned long virt, unsigned long phys, unsigned long len, 


extern int __syscall_stub_start;



void setup_physmem(unsigned long start, unsigned long reserve_end,

void __init setup_physmem(unsigned long start, unsigned long reserve_end,

			  unsigned long len, unsigned long long highmem)

{

	unsigned long reserve = reserve_end - start;

arch/um/kernel/skas/process.c

+2 −2
Original line number Diff line number Diff line
@@ -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);