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

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

[PATCH] uml: move tty logging to os-Linux 



The serial UML OS-abstraction layer patch (um/kernel dir).

This moves all systemcalls from tty_log.c file under os-Linux dir

Signed-off-by: default avatarGennady Sharapov <Gennady.V.Sharapov@intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 81efcd33

arch/um/kernel/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -15,15 +15,12 @@ obj-y = config.o exec_kern.o exitcode.o \ 
obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o

obj-$(CONFIG_GPROF)	+= gprof_syms.o

obj-$(CONFIG_GCOV)	+= gmon_syms.o

obj-$(CONFIG_TTY_LOG)	+= tty_log.o

obj-$(CONFIG_SYSCALL_DEBUG) += syscall.o



obj-$(CONFIG_MODE_TT) += tt/

obj-$(CONFIG_MODE_SKAS) += skas/



user-objs-$(CONFIG_TTY_LOG) += tty_log.o



USER_OBJS := $(user-objs-y) config.o tty_log.o

USER_OBJS := config.o



include arch/um/scripts/Makefile.rules

arch/um/kernel/exec_kern.c

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp) 
	CHOOSE_MODE_PROC(start_thread_tt, start_thread_skas, regs, eip, esp);

}



extern void log_exec(char **argv, void *tty);



static long execve1(char *file, char __user * __user *argv,

		    char __user *__user *env)

{

arch/um/os-Linux/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -8,10 +8,12 @@ obj-y = aio.o elf_aux.o file.o helper.o irq.o main.o mem.o process.o sigio.o \ 
	user_syms.o util.o drivers/ sys-$(SUBARCH)/



obj-$(CONFIG_MODE_SKAS) += skas/

obj-$(CONFIG_TTY_LOG) += tty_log.o

user-objs-$(CONFIG_TTY_LOG) += tty_log.o



USER_OBJS := 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 \

	util.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 \

	uaccess.o umid.o util.o



elf_aux.o: $(ARCH_DIR)/kernel-offsets.h

CFLAGS_elf_aux.o += -I$(objtree)/arch/um

arch/um/kernel/tty_log.c→arch/um/os-Linux/tty_log.c

+3 −15
Original line number Diff line number Diff line
@@ -216,15 +216,3 @@ __uml_setup("tty_log_fd=", set_tty_log_fd, 
"    tty data will be written.  Preconfigure the descriptor with something\n"

"    like '10>tty_log tty_log_fd=10'.\n\n"

);
 




/*

 * Overrides for Emacs so that we follow Linus's tabbing style.

 * Emacs will notice this stuff at the end of the file and automatically

 * adjust the settings for this buffer only.  This must remain at the end

 * of the file.

 * ---------------------------------------------------------------------------

 * Local variables:

 * c-file-style: "linux"

 * End:

 */