diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 04:27:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:08 -0400 |
commit | 1a80521990a0e30e61a92994a009adc52161b070 (patch) | |
tree | 3cf900adf9383ff68fd66cd74cfaf0e0ce483845 /arch/um/os-Linux/skas | |
parent | 61b63c556c0877ee6d3832ee641bc427ff4d94d6 (diff) |
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 <jdike@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/os-Linux/skas')
-rw-r--r-- | arch/um/os-Linux/skas/process.c | 12 |
1 files changed, 7 insertions, 5 deletions
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) | |||
294 | 294 | ||
295 | if (getitimer(ITIMER_VIRTUAL, &timer)) | 295 | if (getitimer(ITIMER_VIRTUAL, &timer)) |
296 | printk("Failed to get itimer, errno = %d\n", errno); | 296 | printk("Failed to get itimer, errno = %d\n", errno); |
297 | nsecs = timer.it_value.tv_sec * BILLION + | 297 | nsecs = timer.it_value.tv_sec * UM_NSEC_PER_SEC + |
298 | timer.it_value.tv_usec * 1000; | 298 | timer.it_value.tv_usec * UM_NSEC_PER_USEC; |
299 | nsecs += os_nsecs(); | 299 | nsecs += os_nsecs(); |
300 | 300 | ||
301 | while (1) { | 301 | while (1) { |
@@ -347,8 +347,10 @@ void userspace(struct uml_pt_regs *regs) | |||
347 | block_signals(); | 347 | block_signals(); |
348 | (*sig_info[sig])(sig, regs); | 348 | (*sig_info[sig])(sig, regs); |
349 | unblock_signals(); | 349 | unblock_signals(); |
350 | nsecs = timer.it_value.tv_sec * BILLION + | 350 | nsecs = timer.it_value.tv_sec * |
351 | timer.it_value.tv_usec * 1000; | 351 | UM_NSEC_PER_SEC + |
352 | timer.it_value.tv_usec * | ||
353 | UM_NSEC_PER_USEC; | ||
352 | nsecs += os_nsecs(); | 354 | nsecs += os_nsecs(); |
353 | break; | 355 | break; |
354 | case SIGIO: | 356 | case SIGIO: |
@@ -395,7 +397,7 @@ __initcall(init_thread_regs); | |||
395 | 397 | ||
396 | int copy_context_skas0(unsigned long new_stack, int pid) | 398 | int copy_context_skas0(unsigned long new_stack, int pid) |
397 | { | 399 | { |
398 | struct timeval tv = { .tv_sec = 0, .tv_usec = 1000000 / UM_HZ }; | 400 | struct timeval tv = { .tv_sec = 0, .tv_usec = UM_USEC_PER_SEC / UM_HZ }; |
399 | int err; | 401 | int err; |
400 | unsigned long current_stack = current_stub_stack(); | 402 | unsigned long current_stack = current_stub_stack(); |
401 | struct stub_data *data = (struct stub_data *) current_stack; | 403 | struct stub_data *data = (struct stub_data *) current_stack; |