um: distribute exports to where exported stuff is defined

ksyms.c is down to the stuff defined in various USER_OBJS Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>

um: distribute exports to where exported stuff is defined
ksyms.c is down to the stuff defined in various USER_OBJS Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
Al Viro · Richard Weinberger
1 parent a34978cbd9
Showing 10 changed files with 40 additions and 54 deletions Side-by-side Diff
arch/um/kernel/exec.c
arch/um/kernel/irq.c
arch/um/kernel/ksyms.c
arch/um/kernel/mem.c
arch/um/kernel/physmem.c
arch/um/kernel/process.c
arch/um/kernel/skas/uaccess.c
arch/um/kernel/tlb.c
arch/um/kernel/trap.c
arch/um/kernel/um_arch.c
@@ -3,14 +3,15 @@
  * Licensed under the GPL
  */
  
-#include "linux/stddef.h"
-#include "linux/fs.h"
-#include "linux/ptrace.h"
-#include "linux/sched.h"
-#include "linux/slab.h"
-#include "asm/current.h"
-#include "asm/processor.h"
-#include "asm/uaccess.h"
+#include <linux/stddef.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/ptrace.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <asm/current.h>
+#include <asm/processor.h>
+#include <asm/uaccess.h>
 #include "as-layout.h"
 #include "mem_user.h"
 #include "skas.h"
@@ -41,6 +42,7 @@
 	PT_REGS_IP(regs) = eip;
 	PT_REGS_SP(regs) = esp;
 }
+EXPORT_SYMBOL(start_thread);
  
 static long execve1(const char *file,
 		    const char __user *const __user *argv,
@@ -258,6 +258,7 @@
  
 	ignore_sigio_fd(fd);
 }
+EXPORT_SYMBOL(deactivate_fd);
  
 /*
  * Called just before shutdown in order to provide a clean exec
@@ -3,34 +3,12 @@
  * Licensed under the GPL
  */
  
-#include "linux/module.h"
-#include "linux/syscalls.h"
-#include "asm/tlbflush.h"
-#include "asm/uaccess.h"
-#include "as-layout.h"
-#include "kern_util.h"
-#include "mem_user.h"
+#include <linux/module.h>
 #include "os.h"
  
-EXPORT_SYMBOL(uml_physmem);
 EXPORT_SYMBOL(set_signals);
 EXPORT_SYMBOL(get_signals);
-EXPORT_SYMBOL(kernel_thread);
-EXPORT_SYMBOL(sys_waitpid);
-EXPORT_SYMBOL(flush_tlb_range);
  
-EXPORT_SYMBOL(high_physmem);
-EXPORT_SYMBOL(empty_zero_page);
-EXPORT_SYMBOL(handle_page_fault);
-EXPORT_SYMBOL(find_iomem);
-
-EXPORT_SYMBOL(strnlen_user);
-EXPORT_SYMBOL(strncpy_from_user);
-EXPORT_SYMBOL(copy_to_user);
-EXPORT_SYMBOL(copy_from_user);
-EXPORT_SYMBOL(clear_user);
-EXPORT_SYMBOL(uml_strdup);
-
 EXPORT_SYMBOL(os_stat_fd);
 EXPORT_SYMBOL(os_stat_file);
 EXPORT_SYMBOL(os_access);
  
  
@@ -57,25 +35,11 @@
 EXPORT_SYMBOL(os_accept_connection);
 EXPORT_SYMBOL(os_rcv_fd);
 EXPORT_SYMBOL(run_helper);
-EXPORT_SYMBOL(start_thread);
 EXPORT_SYMBOL(os_major);
 EXPORT_SYMBOL(os_minor);
 EXPORT_SYMBOL(os_makedev);
  
 EXPORT_SYMBOL(add_sigio_fd);
 EXPORT_SYMBOL(ignore_sigio_fd);
-EXPORT_SYMBOL(deactivate_fd);
 EXPORT_SYMBOL(sigio_broken);
-
-#ifdef CONFIG_SMP
-
-/* required for SMP */
-
-extern void __write_lock_failed(rwlock_t *rw);
-EXPORT_SYMBOL(__write_lock_failed);
-
-extern void __read_lock_failed(rwlock_t *rw);
-EXPORT_SYMBOL(__read_lock_failed);
-
-#endif
@@ -4,6 +4,7 @@
  */
  
 #include <linux/stddef.h>
+#include <linux/module.h>
 #include <linux/bootmem.h>
 #include <linux/highmem.h>
 #include <linux/mm.h>
@@ -20,6 +21,7 @@
  
 /* allocated in paging_init, zeroed in mem_init, and unchanged thereafter */
 unsigned long *empty_zero_page = NULL;
+EXPORT_SYMBOL(empty_zero_page);
 /* allocated in paging_init and unchanged thereafter */
 static unsigned long *empty_bad_page = NULL;
  
@@ -3,20 +3,22 @@
  * Licensed under the GPL
  */
  
-#include "linux/bootmem.h"
-#include "linux/mm.h"
-#include "linux/pfn.h"
-#include "asm/page.h"
-#include "as-layout.h"
-#include "init.h"
-#include "kern.h"
-#include "mem_user.h"
-#include "os.h"
+#include <linux/module.h>
+#include <linux/bootmem.h>
+#include <linux/mm.h>
+#include <linux/pfn.h>
+#include <asm/page.h>
+#include <as-layout.h>
+#include <init.h>
+#include <kern.h>
+#include <mem_user.h>
+#include <os.h>
  
 static int physmem_fd = -1;
  
 /* Changed during early boot */
 unsigned long high_physmem;
+EXPORT_SYMBOL(high_physmem);
  
 extern unsigned long long physmem_size;
  
@@ -184,6 +186,7 @@
  
 	return 0;
 }
+EXPORT_SYMBOL(find_iomem);
  
 static int setup_iomem(void)
 {
@@ -78,6 +78,7 @@
 		      &current->thread.regs, 0, NULL, NULL);
 	return pid;
 }
+EXPORT_SYMBOL(kernel_thread);
  
 static inline void set_current(struct task_struct *task)
 {
@@ -286,6 +287,7 @@
 {
 	return kstrdup(string, GFP_KERNEL);
 }
+EXPORT_SYMBOL(uml_strdup);
  
 int copy_to_user_proc(void __user *to, void *from, int size)
 {
@@ -6,6 +6,7 @@
 #include <linux/err.h>
 #include <linux/highmem.h>
 #include <linux/mm.h>
+#include <linux/module.h>
 #include <linux/sched.h>
 #include <asm/current.h>
 #include <asm/page.h>
@@ -149,6 +150,7 @@
 	       buffer_op((unsigned long) from, n, 0, copy_chunk_from_user, &to):
 	       n;
 }
+EXPORT_SYMBOL(copy_from_user);
  
 static int copy_chunk_to_user(unsigned long to, int len, void *arg)
 {
@@ -170,6 +172,7 @@
 	       buffer_op((unsigned long) to, n, 1, copy_chunk_to_user, &from) :
 	       n;
 }
+EXPORT_SYMBOL(copy_to_user);
  
 static int strncpy_chunk_from_user(unsigned long from, int len, void *arg)
 {
@@ -204,6 +207,7 @@
 		return -EFAULT;
 	return strnlen(dst, count);
 }
+EXPORT_SYMBOL(strncpy_from_user);
  
 static int clear_chunk(unsigned long addr, int len, void *unused)
 {
@@ -226,6 +230,7 @@
 	return access_ok(VERIFY_WRITE, mem, len) ?
 	       buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL) : len;
 }
+EXPORT_SYMBOL(clear_user);
  
 static int strnlen_chunk(unsigned long str, int len, void *arg)
 {
@@ -251,4 +256,5 @@
 		return count + 1;
 	return -EFAULT;
 }
+EXPORT_SYMBOL(strnlen_user);
@@ -4,6 +4,7 @@
  */
  
 #include <linux/mm.h>
+#include <linux/module.h>
 #include <linux/sched.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
@@ -498,6 +499,7 @@
 		flush_tlb_kernel_range_common(start, end);
 	else fix_range(vma->vm_mm, start, end, 0);
 }
+EXPORT_SYMBOL(flush_tlb_range);
  
 void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,
 			unsigned long end)
@@ -6,6 +6,7 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/hardirq.h>
+#include <linux/module.h>
 #include <asm/current.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
@@ -111,6 +112,7 @@
 	pagefault_out_of_memory();
 	return 0;
 }
+EXPORT_SYMBOL(handle_page_fault);
  
 static void show_segv_info(struct uml_pt_regs *regs)
 {
@@ -102,6 +102,8 @@
  
 /* Set in linux_main */
 unsigned long uml_physmem;
+EXPORT_SYMBOL(uml_physmem);
+
 unsigned long uml_reserved; /* Also modified in mem_init */
 unsigned long start_vm;
 unsigned long end_vm;
...	...	@@ -3,14 +3,15 @@
3	3	* Licensed under the GPL
4	4	*/
5	5
6		-#include "linux/stddef.h"
7		-#include "linux/fs.h"
8		-#include "linux/ptrace.h"
9		-#include "linux/sched.h"
10		-#include "linux/slab.h"
11		-#include "asm/current.h"
12		-#include "asm/processor.h"
13		-#include "asm/uaccess.h"
	6	+#include <linux/stddef.h>
	7	+#include <linux/module.h>
	8	+#include <linux/fs.h>
	9	+#include <linux/ptrace.h>
	10	+#include <linux/sched.h>
	11	+#include <linux/slab.h>
	12	+#include <asm/current.h>
	13	+#include <asm/processor.h>
	14	+#include <asm/uaccess.h>
14	15	#include "as-layout.h"
15	16	#include "mem_user.h"
16	17	#include "skas.h"
...	...	@@ -41,6 +42,7 @@
41	42	PT_REGS_IP(regs) = eip;
42	43	PT_REGS_SP(regs) = esp;
43	44	}
	45	+EXPORT_SYMBOL(start_thread);
44	46
45	47	static long execve1(const char *file,
46	48	const char __user const __user argv,
...	...	@@ -258,6 +258,7 @@
258	258
259	259	ignore_sigio_fd(fd);
260	260	}
	261	+EXPORT_SYMBOL(deactivate_fd);
261	262
262	263	/*
263	264	* Called just before shutdown in order to provide a clean exec
...	...	@@ -3,34 +3,12 @@
3	3	* Licensed under the GPL
4	4	*/
5	5
6		-#include "linux/module.h"
7		-#include "linux/syscalls.h"
8		-#include "asm/tlbflush.h"
9		-#include "asm/uaccess.h"
10		-#include "as-layout.h"
11		-#include "kern_util.h"
12		-#include "mem_user.h"
	6	+#include <linux/module.h>
13	7	#include "os.h"
14	8
15		-EXPORT_SYMBOL(uml_physmem);
16	9	EXPORT_SYMBOL(set_signals);
17	10	EXPORT_SYMBOL(get_signals);
18		-EXPORT_SYMBOL(kernel_thread);
19		-EXPORT_SYMBOL(sys_waitpid);
20		-EXPORT_SYMBOL(flush_tlb_range);
21	11
22		-EXPORT_SYMBOL(high_physmem);
23		-EXPORT_SYMBOL(empty_zero_page);
24		-EXPORT_SYMBOL(handle_page_fault);
25		-EXPORT_SYMBOL(find_iomem);
26		-
27		-EXPORT_SYMBOL(strnlen_user);
28		-EXPORT_SYMBOL(strncpy_from_user);
29		-EXPORT_SYMBOL(copy_to_user);
30		-EXPORT_SYMBOL(copy_from_user);
31		-EXPORT_SYMBOL(clear_user);
32		-EXPORT_SYMBOL(uml_strdup);
33		-
34	12	EXPORT_SYMBOL(os_stat_fd);
35	13	EXPORT_SYMBOL(os_stat_file);
36	14	EXPORT_SYMBOL(os_access);
37	15
38	16
...	...	@@ -57,25 +35,11 @@
57	35	EXPORT_SYMBOL(os_accept_connection);
58	36	EXPORT_SYMBOL(os_rcv_fd);
59	37	EXPORT_SYMBOL(run_helper);
60		-EXPORT_SYMBOL(start_thread);
61	38	EXPORT_SYMBOL(os_major);
62	39	EXPORT_SYMBOL(os_minor);
63	40	EXPORT_SYMBOL(os_makedev);
64	41
65	42	EXPORT_SYMBOL(add_sigio_fd);
66	43	EXPORT_SYMBOL(ignore_sigio_fd);
67		-EXPORT_SYMBOL(deactivate_fd);
68	44	EXPORT_SYMBOL(sigio_broken);
69		-
70		-#ifdef CONFIG_SMP
71		-
72		-/* required for SMP */
73		-
74		-extern void __write_lock_failed(rwlock_t *rw);
75		-EXPORT_SYMBOL(__write_lock_failed);
76		-
77		-extern void __read_lock_failed(rwlock_t *rw);
78		-EXPORT_SYMBOL(__read_lock_failed);
79		-
80		-#endif
...	...	@@ -4,6 +4,7 @@
4	4	*/
5	5
6	6	#include <linux/stddef.h>
	7	+#include <linux/module.h>
7	8	#include <linux/bootmem.h>
8	9	#include <linux/highmem.h>
9	10	#include <linux/mm.h>
...	...	@@ -20,6 +21,7 @@
20	21
21	22	/* allocated in paging_init, zeroed in mem_init, and unchanged thereafter */
22	23	unsigned long *empty_zero_page = NULL;
	24	+EXPORT_SYMBOL(empty_zero_page);
23	25	/* allocated in paging_init and unchanged thereafter */
24	26	static unsigned long *empty_bad_page = NULL;
25	27
...	...	@@ -3,20 +3,22 @@
3	3	* Licensed under the GPL
4	4	*/
5	5
6		-#include "linux/bootmem.h"
7		-#include "linux/mm.h"
8		-#include "linux/pfn.h"
9		-#include "asm/page.h"
10		-#include "as-layout.h"
11		-#include "init.h"
12		-#include "kern.h"
13		-#include "mem_user.h"
14		-#include "os.h"
	6	+#include <linux/module.h>
	7	+#include <linux/bootmem.h>
	8	+#include <linux/mm.h>
	9	+#include <linux/pfn.h>
	10	+#include <asm/page.h>
	11	+#include <as-layout.h>
	12	+#include <init.h>
	13	+#include <kern.h>
	14	+#include <mem_user.h>
	15	+#include <os.h>
15	16
16	17	static int physmem_fd = -1;
17	18
18	19	/* Changed during early boot */
19	20	unsigned long high_physmem;
	21	+EXPORT_SYMBOL(high_physmem);
20	22
21	23	extern unsigned long long physmem_size;
22	24
...	...	@@ -184,6 +186,7 @@
184	186
185	187	return 0;
186	188	}
	189	+EXPORT_SYMBOL(find_iomem);
187	190
188	191	static int setup_iomem(void)
189	192	{
...	...	@@ -78,6 +78,7 @@
78	78	&current->thread.regs, 0, NULL, NULL);
79	79	return pid;
80	80	}
	81	+EXPORT_SYMBOL(kernel_thread);
81	82
82	83	static inline void set_current(struct task_struct *task)
83	84	{
...	...	@@ -286,6 +287,7 @@
286	287	{
287	288	return kstrdup(string, GFP_KERNEL);
288	289	}
	290	+EXPORT_SYMBOL(uml_strdup);
289	291
290	292	int copy_to_user_proc(void __user to, void from, int size)
291	293	{
...	...	@@ -6,6 +6,7 @@
6	6	#include <linux/err.h>
7	7	#include <linux/highmem.h>
8	8	#include <linux/mm.h>
	9	+#include <linux/module.h>
9	10	#include <linux/sched.h>
10	11	#include <asm/current.h>
11	12	#include <asm/page.h>
...	...	@@ -149,6 +150,7 @@
149	150	buffer_op((unsigned long) from, n, 0, copy_chunk_from_user, &to):
150	151	n;
151	152	}
	153	+EXPORT_SYMBOL(copy_from_user);
152	154
153	155	static int copy_chunk_to_user(unsigned long to, int len, void *arg)
154	156	{
...	...	@@ -170,6 +172,7 @@
170	172	buffer_op((unsigned long) to, n, 1, copy_chunk_to_user, &from) :
171	173	n;
172	174	}
	175	+EXPORT_SYMBOL(copy_to_user);
173	176
174	177	static int strncpy_chunk_from_user(unsigned long from, int len, void *arg)
175	178	{
...	...	@@ -204,6 +207,7 @@
204	207	return -EFAULT;
205	208	return strnlen(dst, count);
206	209	}
	210	+EXPORT_SYMBOL(strncpy_from_user);
207	211
208	212	static int clear_chunk(unsigned long addr, int len, void *unused)
209	213	{
...	...	@@ -226,6 +230,7 @@
226	230	return access_ok(VERIFY_WRITE, mem, len) ?
227	231	buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL) : len;
228	232	}
	233	+EXPORT_SYMBOL(clear_user);
229	234
230	235	static int strnlen_chunk(unsigned long str, int len, void *arg)
231	236	{
...	...	@@ -251,4 +256,5 @@
251	256	return count + 1;
252	257	return -EFAULT;
253	258	}
	259	+EXPORT_SYMBOL(strnlen_user);
...	...	@@ -102,6 +102,8 @@
102	102
103	103	/* Set in linux_main */
104	104	unsigned long uml_physmem;
	105	+EXPORT_SYMBOL(uml_physmem);
	106	+
105	107	unsigned long uml_reserved; /* Also modified in mem_init */
106	108	unsigned long start_vm;
107	109	unsigned long end_vm;