From 1a80521990a0e30e61a92994a009adc52161b070 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Tue, 16 Oct 2007 01:27:28 -0700 Subject: uml: use *SEC_PER_*SEC constants There are various uses of powers of 1000, plus the odd BILLION constant in the time code. However, there are perfectly good definitions of *SEC_PER_*SEC in linux/time.h which can be used instaed. These are replaced directly in kernel code. Userspace code imports those constants as UM_*SEC_PER_*SEC and uses these. Signed-off-by: Jeff Dike Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/um/os-Linux/skas/process.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'arch/um/os-Linux/skas/process.c') diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c index 9936531a2620..8548f126d628 100644 --- a/arch/um/os-Linux/skas/process.c +++ b/arch/um/os-Linux/skas/process.c @@ -294,8 +294,8 @@ void userspace(struct uml_pt_regs *regs) if (getitimer(ITIMER_VIRTUAL, &timer)) printk("Failed to get itimer, errno = %d\n", errno); - nsecs = timer.it_value.tv_sec * BILLION + - timer.it_value.tv_usec * 1000; + nsecs = timer.it_value.tv_sec * UM_NSEC_PER_SEC + + timer.it_value.tv_usec * UM_NSEC_PER_USEC; nsecs += os_nsecs(); while (1) { @@ -347,8 +347,10 @@ void userspace(struct uml_pt_regs *regs) block_signals(); (*sig_info[sig])(sig, regs); unblock_signals(); - nsecs = timer.it_value.tv_sec * BILLION + - timer.it_value.tv_usec * 1000; + nsecs = timer.it_value.tv_sec * + UM_NSEC_PER_SEC + + timer.it_value.tv_usec * + UM_NSEC_PER_USEC; nsecs += os_nsecs(); break; case SIGIO: @@ -395,7 +397,7 @@ __initcall(init_thread_regs); int copy_context_skas0(unsigned long new_stack, int pid) { - struct timeval tv = { .tv_sec = 0, .tv_usec = 1000000 / UM_HZ }; + struct timeval tv = { .tv_sec = 0, .tv_usec = UM_USEC_PER_SEC / UM_HZ }; int err; unsigned long current_stack = current_stub_stack(); struct stub_data *data = (struct stub_data *) current_stack; -- cgit v1.2.1