aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-09-27 04:50:38 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-27 11:26:16 -0400
commit0915ee38c7db57ff41a7a68bcc02d0dd3b7b849b (patch)
tree63b608e830c06fa9eeb102e5fd71d0feb84c4d50 /arch
parente3ccf6e3699c879973b616fe681ecaa363457d41 (diff)
[PATCH] uml: mark some tt-mode code
Mark a symbol and file as being tt-mode only. This shrinks the binary slightly when tt mode support is compiled out and makes it easier to identity stuff when tt mode is removed. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/include/os.h3
-rw-r--r--arch/um/kernel/ksyms.c2
-rw-r--r--arch/um/os-Linux/Makefile8
3 files changed, 9 insertions, 4 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index 24fb6d8680e1..be71b3d4c961 100644
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -198,7 +198,9 @@ extern long os_ptrace_ldt(long pid, long addr, long data);
198extern int os_getpid(void); 198extern int os_getpid(void);
199extern int os_getpgrp(void); 199extern int os_getpgrp(void);
200 200
201#ifdef UML_CONFIG_MODE_TT
201extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int)); 202extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int));
203#endif
202extern void init_new_thread_signals(void); 204extern void init_new_thread_signals(void);
203extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr); 205extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr);
204 206
@@ -216,7 +218,6 @@ extern void os_flush_stdout(void);
216 */ 218 */
217extern void forward_ipi(int fd, int pid); 219extern void forward_ipi(int fd, int pid);
218extern void kill_child_dead(int pid); 220extern void kill_child_dead(int pid);
219extern void stop(void);
220extern int wait_for_stop(int pid, int sig, int cont_type, void *relay); 221extern int wait_for_stop(int pid, int sig, int cont_type, void *relay);
221extern int protect_memory(unsigned long addr, unsigned long len, 222extern int protect_memory(unsigned long addr, unsigned long len,
222 int r, int w, int x, int must_succeed); 223 int r, int w, int x, int must_succeed);
diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c
index c97045d6d89f..9cbd9bb7e6d0 100644
--- a/arch/um/kernel/ksyms.c
+++ b/arch/um/kernel/ksyms.c
@@ -21,7 +21,6 @@
21#include "mem_user.h" 21#include "mem_user.h"
22#include "os.h" 22#include "os.h"
23 23
24EXPORT_SYMBOL(stop);
25EXPORT_SYMBOL(uml_physmem); 24EXPORT_SYMBOL(uml_physmem);
26EXPORT_SYMBOL(set_signals); 25EXPORT_SYMBOL(set_signals);
27EXPORT_SYMBOL(get_signals); 26EXPORT_SYMBOL(get_signals);
@@ -41,6 +40,7 @@ EXPORT_SYMBOL(handle_page_fault);
41EXPORT_SYMBOL(find_iomem); 40EXPORT_SYMBOL(find_iomem);
42 41
43#ifdef CONFIG_MODE_TT 42#ifdef CONFIG_MODE_TT
43EXPORT_SYMBOL(stop);
44EXPORT_SYMBOL(strncpy_from_user_tt); 44EXPORT_SYMBOL(strncpy_from_user_tt);
45EXPORT_SYMBOL(copy_from_user_tt); 45EXPORT_SYMBOL(copy_from_user_tt);
46EXPORT_SYMBOL(copy_to_user_tt); 46EXPORT_SYMBOL(copy_to_user_tt);
diff --git a/arch/um/os-Linux/Makefile b/arch/um/os-Linux/Makefile
index f4bfc4c7ccac..b4183929b32c 100644
--- a/arch/um/os-Linux/Makefile
+++ b/arch/um/os-Linux/Makefile
@@ -4,15 +4,19 @@
4# 4#
5 5
6obj-y = aio.o elf_aux.o file.o helper.o irq.o main.o mem.o process.o sigio.o \ 6obj-y = aio.o elf_aux.o file.o helper.o irq.o main.o mem.o process.o sigio.o \
7 signal.o start_up.o time.o trap.o tt.o tty.o uaccess.o umid.o tls.o \ 7 signal.o start_up.o time.o trap.o tty.o uaccess.o umid.o tls.o \
8 user_syms.o util.o drivers/ sys-$(SUBARCH)/ 8 user_syms.o util.o drivers/ sys-$(SUBARCH)/
9 9
10obj-$(CONFIG_MODE_SKAS) += skas/ 10obj-$(CONFIG_MODE_SKAS) += skas/
11
12obj-$(CONFIG_MODE_TT) += tt.o
13user-objs-$(CONFIG_MODE_TT) += tt.o
14
11obj-$(CONFIG_TTY_LOG) += tty_log.o 15obj-$(CONFIG_TTY_LOG) += tty_log.o
12user-objs-$(CONFIG_TTY_LOG) += tty_log.o 16user-objs-$(CONFIG_TTY_LOG) += tty_log.o
13 17
14USER_OBJS := $(user-objs-y) aio.o elf_aux.o file.o helper.o irq.o main.o mem.o \ 18USER_OBJS := $(user-objs-y) aio.o elf_aux.o file.o helper.o irq.o main.o mem.o \
15 process.o sigio.o signal.o start_up.o time.o trap.o tt.o tty.o tls.o \ 19 process.o sigio.o signal.o start_up.o time.o trap.o tty.o tls.o \
16 uaccess.o umid.o util.o 20 uaccess.o umid.o util.o
17 21
18CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH) 22CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH)