Commit cff65c4f authored by Gennady Sharapov's avatar Gennady Sharapov Committed by Linus Torvalds
Browse files

[PATCH] uml: move libc-dependent time code 



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

This moves all systemcalls from time.c file under os-Linux dir and joins
time.c and tine_kernel.c files

Signed-off-by: default avatarGennady Sharapov <Gennady.V.Sharapov@intel.com>
Signed-off-by: default avatarJeff Dike <jdike@addtoit.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 4fef0c10

arch/um/include/os.h

+11 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ extern int os_protect_memory(void *addr, unsigned long len, 
			     int r, int w, int x);

extern int os_unmap_memory(void *addr, int len);

extern void os_flush_stdout(void);

extern unsigned long long os_usecs(void);



/* tt.c

 * for tt mode only (will be deleted in future...)
@@ -245,4 +244,15 @@ extern void setup_machinename(char *machine_out); 
extern void setup_hostinfo(void);

extern int setjmp_wrapper(void (*proc)(void *, void *), ...);



/* time.c */

#define BILLION (1000 * 1000 * 1000)



extern void switch_timers(int to_real);

extern void idle_sleep(int secs);

extern void enable_timer(void);

extern void disable_timer(void);

extern void user_time_init(void);

extern void uml_idle_timer(void);

extern unsigned long long os_nsecs(void);



#endif

arch/um/include/time_user.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/* 

 * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)

 * Licensed under the GPL

 */



#ifndef __TIME_USER_H__

#define __TIME_USER_H__



extern void timer(void);

extern void switch_timers(int to_real);

extern void idle_sleep(int secs);

extern void enable_timer(void);

extern void prepare_timer(void * ptr);

extern void disable_timer(void);

extern unsigned long time_lock(void);

extern void time_unlock(unsigned long);

extern void user_time_init(void);



#endif

arch/um/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ clean-files := 
obj-y = config.o exec_kern.o exitcode.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 smp.o syscall_kern.o sysrq.o time.o \

	signal_kern.o smp.o syscall_kern.o sysrq.o \

	time_kern.o tlb.o trap_kern.o uaccess.o um_arch.o umid.o



obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
@@ -23,7 +23,7 @@ obj-$(CONFIG_MODE_SKAS) += skas/ 


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



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

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



include arch/um/scripts/Makefile.rules

arch/um/kernel/exec_kern.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "irq_user.h"

#include "tlb.h"

#include "os.h"

#include "time_user.h"

#include "choose-mode.h"

#include "mode_kern.h"

arch/um/kernel/process_kern.c

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include "init.h"

#include "irq_user.h"

#include "mem_user.h"

#include "time_user.h"

#include "tlb.h"

#include "frame_kern.h"

#include "sigcontext.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE