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

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

[PATCH] uml: separate libc-dependent early initialization



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

This moves all systemcalls from main.c file under os-Linux dir and joins mem.c
and um_arch.c files.

Signed-off-by: default avatarGennady Sharapov <Gennady.V.Sharapov@intel.com>
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bb578426
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ extra-y := vmlinux.lds
clean-files :=

obj-y = config.o exec_kern.o exitcode.o \
	helper.o init_task.o irq.o irq_user.o ksyms.o main.o mem.o physmem.o \
	helper.o init_task.o irq.o irq_user.o ksyms.o mem.o physmem.o \
	process_kern.o ptrace.o reboot.o resource.o sigio_user.o sigio_kern.o \
	signal_kern.o signal_user.o smp.o syscall_kern.o sysrq.o time.o \
	time_kern.o tlb.o trap_kern.o trap_user.o uaccess.o um_arch.o \
@@ -24,7 +24,7 @@ obj-$(CONFIG_MODE_SKAS) += skas/

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

USER_OBJS := $(user-objs-y) config.o helper.o main.o time.o tty_log.o umid.o \
USER_OBJS := $(user-objs-y) config.o helper.o time.o tty_log.o umid.o \
	user_util.o

include arch/um/scripts/Makefile.rules
+4 −4
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@
# Licensed under the GPL
#

obj-y = aio.o elf_aux.o file.o mem.o process.o signal.o start_up.o time.o \
	tt.o tty.o uaccess.o user_syms.o drivers/ sys-$(SUBARCH)/
obj-y = aio.o elf_aux.o file.o main.o mem.o process.o signal.o start_up.o \
	time.o tt.o tty.o uaccess.o user_syms.o drivers/ sys-$(SUBARCH)/

USER_OBJS := aio.o elf_aux.o file.o mem.o process.o signal.o start_up.o \
	time.o tt.o tty.o uaccess.o
USER_OBJS := aio.o elf_aux.o file.o main.o mem.o process.o signal.o \
	start_up.o time.o tt.o tty.o uaccess.o

elf_aux.o: $(ARCH_DIR)/kernel-offsets.h
CFLAGS_elf_aux.o += -I$(objtree)/arch/um
+19 −30
Original line number Diff line number Diff line
@@ -257,14 +257,3 @@ void __wrap_free(void *ptr)
	}
	else __real_free(ptr);
}

/*
 * 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:
 */