[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>
This commit is contained in:
Jeff Dike 2006-09-27 01:50:38 -07:00 committed by Linus Torvalds
parent e3ccf6e369
commit 0915ee38c7
3 changed files with 9 additions and 4 deletions

View File

@ -198,7 +198,9 @@ extern long os_ptrace_ldt(long pid, long addr, long data);
extern int os_getpid(void); extern int os_getpid(void);
extern int os_getpgrp(void); extern int os_getpgrp(void);
#ifdef UML_CONFIG_MODE_TT
extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int)); extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int));
#endif
extern void init_new_thread_signals(void); extern void init_new_thread_signals(void);
extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr); extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr);
@ -216,7 +218,6 @@ extern void os_flush_stdout(void);
*/ */
extern void forward_ipi(int fd, int pid); extern void forward_ipi(int fd, int pid);
extern void kill_child_dead(int pid); extern void kill_child_dead(int pid);
extern void stop(void);
extern int wait_for_stop(int pid, int sig, int cont_type, void *relay); extern int wait_for_stop(int pid, int sig, int cont_type, void *relay);
extern int protect_memory(unsigned long addr, unsigned long len, extern int protect_memory(unsigned long addr, unsigned long len,
int r, int w, int x, int must_succeed); int r, int w, int x, int must_succeed);

View File

@ -21,7 +21,6 @@
#include "mem_user.h" #include "mem_user.h"
#include "os.h" #include "os.h"
EXPORT_SYMBOL(stop);
EXPORT_SYMBOL(uml_physmem); EXPORT_SYMBOL(uml_physmem);
EXPORT_SYMBOL(set_signals); EXPORT_SYMBOL(set_signals);
EXPORT_SYMBOL(get_signals); EXPORT_SYMBOL(get_signals);
@ -41,6 +40,7 @@ EXPORT_SYMBOL(handle_page_fault);
EXPORT_SYMBOL(find_iomem); EXPORT_SYMBOL(find_iomem);
#ifdef CONFIG_MODE_TT #ifdef CONFIG_MODE_TT
EXPORT_SYMBOL(stop);
EXPORT_SYMBOL(strncpy_from_user_tt); EXPORT_SYMBOL(strncpy_from_user_tt);
EXPORT_SYMBOL(copy_from_user_tt); EXPORT_SYMBOL(copy_from_user_tt);
EXPORT_SYMBOL(copy_to_user_tt); EXPORT_SYMBOL(copy_to_user_tt);

View File

@ -4,15 +4,19 @@
# #
obj-y = aio.o elf_aux.o file.o helper.o irq.o main.o mem.o process.o sigio.o \ obj-y = aio.o elf_aux.o file.o helper.o irq.o main.o mem.o process.o sigio.o \
signal.o start_up.o time.o trap.o tt.o tty.o uaccess.o umid.o tls.o \ signal.o start_up.o time.o trap.o tty.o uaccess.o umid.o tls.o \
user_syms.o util.o drivers/ sys-$(SUBARCH)/ user_syms.o util.o drivers/ sys-$(SUBARCH)/
obj-$(CONFIG_MODE_SKAS) += skas/ obj-$(CONFIG_MODE_SKAS) += skas/
obj-$(CONFIG_MODE_TT) += tt.o
user-objs-$(CONFIG_MODE_TT) += tt.o
obj-$(CONFIG_TTY_LOG) += tty_log.o obj-$(CONFIG_TTY_LOG) += tty_log.o
user-objs-$(CONFIG_TTY_LOG) += tty_log.o user-objs-$(CONFIG_TTY_LOG) += tty_log.o
USER_OBJS := $(user-objs-y) aio.o elf_aux.o file.o helper.o irq.o main.o mem.o \ USER_OBJS := $(user-objs-y) aio.o elf_aux.o file.o helper.o irq.o main.o mem.o \
process.o sigio.o signal.o start_up.o time.o trap.o tt.o tty.o tls.o \ process.o sigio.o signal.o start_up.o time.o trap.o tty.o tls.o \
uaccess.o umid.o util.o uaccess.o umid.o util.o
CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH) CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH)