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.

Jeff Dike committed 19 years ago

Commit 97a1fcb1 parent da3e30e6 files · +12 −17Browse files

Unified · Split

6 files

arch/um/drivers/mconsole_kern.c +2 −2
arch/um/drivers/net_kern.c +1 −1
arch/um/kernel/mem.c +1 −1
arch/um/kernel/physmem.c +5 −10
arch/um/kernel/skas/process.c +2 −2
arch/um/os-Linux/process.c +1 −1

arch/um/drivers/mconsole_kern.c+2−2

@@ -499,7 +499,7 @@ static struct mc_device mem_mc = { · 498 unmodified lines
499	499	.remove = mem_remove,
500	500	};
501	501
502		−static int mem_mc_init(void)
	502	+static int __init mem_mc_init(void)
503	503	{
504	504	if(can_drop_memory())
505	505	mconsole_register_dev(&mem_mc);
@@ -798,7 +798,7 @@ void mconsole_stack(struct mc_request *req) · 292 unmodified lines
798	798	*/
799	799	static char *notify_socket = NULL;
800	800
801		−static int mconsole_init(void)
	801	+static int __init mconsole_init(void)
802	802	{
803	803	/* long to avoid size mismatch warnings from gcc */
804	804	long sock;

arch/um/drivers/net_kern.c+1−1

@@ -623,7 +623,7 @@ static int eth_setup_common(char *str, int index) · 622 unmodified lines
623	623	return found;
624	624	}
625	625
626		−static int eth_setup(char *str)
	626	+static int __init eth_setup(char *str)
627	627	{
628	628	struct eth_init *new;
629	629	char *error;

arch/um/kernel/mem.c+1−1

@@ -62,7 +62,7 @@ static void setup_highmem(unsigned long highmem_start, · 61 unmodified lines
62	62	}
63	63	#endif
64	64
65		−void mem_init(void)
	65	+void __init mem_init(void)
66	66	{
67	67	/* clear the zero-page */
68	68	memset((void *) empty_zero_page, 0, PAGE_SIZE);

arch/um/kernel/physmem.c+5−10

@@ -28,7 +28,8 @@ unsigned long high_physmem; · 27 unmodified lines
28	28
29	29	extern unsigned long long physmem_size;
30	30
31		−int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem)
	31	+int __init init_maps(unsigned long physmem, unsigned long iomem,
	32	+ unsigned long highmem)
32	33	{
33	34	struct page p, map;
34	35	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) · 12 unmodified lines
47	48	total_pages = phys_pages + iomem_pages + highmem_pages;
48	49	total_len = phys_len + iomem_len + highmem_len;
49	50
50		− if(kmalloc_ok){
51		− map = kmalloc(total_len, GFP_KERNEL);
52		− if(map == NULL)
53		− map = vmalloc(total_len);
54		− }
55		− else map = alloc_bootmem_low_pages(total_len);
56		−
	51	+ map = alloc_bootmem_low_pages(total_len);
57	52	if(map == NULL)
58	53	return -ENOMEM;
59	54
@@ -98,8 +93,8 @@ void map_memory(unsigned long virt, unsigned long phys, unsigned long len, · 38 unmodified lines
98	93
99	94	extern int __syscall_stub_start;
100	95
101		−void setup_physmem(unsigned long start, unsigned long reserve_end,
102		− unsigned long len, unsigned long long highmem)
	96	+void __init setup_physmem(unsigned long start, unsigned long reserve_end,
	97	+ unsigned long len, unsigned long long highmem)
103	98	{
104	99	unsigned long reserve = reserve_end - start;
105	100	int pfn = PFN_UP(__pa(reserve_end));

arch/um/kernel/skas/process.c+2−2

@@ -145,7 +145,7 @@ void init_idle_skas(void) · 144 unmodified lines
145	145
146	146	extern void start_kernel(void);
147	147
148		−static int start_kernel_proc(void *unused)
	148	+static int __init start_kernel_proc(void *unused)
149	149	{
150	150	int pid;
151	151
@@ -165,7 +165,7 @@ extern int userspace_pid[]; · 13 unmodified lines
165	165
166	166	extern char cpu0_irqstack[];
167	167
168		−int start_uml_skas(void)
	168	+int __init start_uml_skas(void)
169	169	{
170	170	stack_protections((unsigned long) &cpu0_irqstack);
171	171	set_sigstack(cpu0_irqstack, THREAD_SIZE);

arch/um/os-Linux/process.c+1−1

@@ -194,7 +194,7 @@ int os_unmap_memory(void *addr, int len) · 193 unmodified lines
194	194	#define MADV_REMOVE KERNEL_MADV_REMOVE
195	195	#endif
196	196
197		−int __init os_drop_memory(void *addr, int length)
	197	+int os_drop_memory(void *addr, int length)
198	198	{
199	199	int err;
200	200