diff options
author | Jeff Dike <jdike@addtoit.com> | 2005-06-25 23:55:24 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 01:24:35 +0200 |
commit | fc47a0d18a1994b4a18d2235fcde1b75dfa72552 (patch) | |
tree | fd551126b4ae4a4a6e9be99773cf04a7eacc4b72 /arch/um/kernel/skas/Makefile | |
parent | [PATCH] uml: always disable kmalloc during shutdown (diff) | |
download | linux-fc47a0d18a1994b4a18d2235fcde1b75dfa72552.tar.xz linux-fc47a0d18a1994b4a18d2235fcde1b75dfa72552.zip |
[PATCH] uml: time initialization tidying
user_time_init_skas and user_time_init_tt were essentially the same. So, this
merges them, deleting the mode-specific functions and declarations.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/kernel/skas/Makefile')
-rw-r--r-- | arch/um/kernel/skas/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/kernel/skas/Makefile b/arch/um/kernel/skas/Makefile index d37d1bfcd6f7..ff69c4b312c0 100644 --- a/arch/um/kernel/skas/Makefile +++ b/arch/um/kernel/skas/Makefile @@ -4,10 +4,10 @@ # obj-y := exec_kern.o mem.o mem_user.o mmu.o process.o process_kern.o \ - syscall_kern.o syscall_user.o time.o tlb.o trap_user.o uaccess.o \ + syscall_kern.o syscall_user.o tlb.o trap_user.o uaccess.o \ subdir- := util -USER_OBJS := process.o time.o +USER_OBJS := process.o include arch/um/scripts/Makefile.rules |