diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 08:26:54 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 16:43:05 (GMT) |
commit | 4c9e13851315a25a705e7a686116e491041ca228 (patch) | |
tree | a323e1dcfe89f6c9d7e873a1bf2ad7aab9cdb9e6 /arch/um/os-Linux/time.c | |
parent | c28b59d4779a43e9b7e786c7004cbee8fab1527d (diff) | |
download | linux-fsl-qoriq-4c9e13851315a25a705e7a686116e491041ca228.tar.xz |
uml: style fixes pass 1
Formatting changes in the files which have been changed in the
tt-removal patchset so far. These include:
copyright updates
header file trimming
style fixes
adding severity to printks
indenting Kconfig help according to the predominant kernel style
These changes should be entirely non-functional.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
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/time.c')
-rw-r--r-- | arch/um/os-Linux/time.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c index 5eb32d2..f22fcdf 100644 --- a/arch/um/os-Linux/time.c +++ b/arch/um/os-Linux/time.c @@ -1,21 +1,17 @@ /* - * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com) + * Copyright (C) 2000 - 2007 Jeff Dike (jdike{addtoit,linux.intel}.com) * Licensed under the GPL */ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> +#include <stddef.h> +#include <errno.h> +#include <signal.h> #include <time.h> #include <sys/time.h> -#include <signal.h> -#include <errno.h> #include "kern_util.h" -#include "user.h" -#include "process.h" #include "kern_constants.h" #include "os.h" -#include "uml-config.h" +#include "user.h" int set_interval(int is_virtual) { @@ -24,7 +20,7 @@ int set_interval(int is_virtual) struct itimerval interval = ((struct itimerval) { { 0, usec }, { 0, usec } }); - if(setitimer(timer_type, &interval, NULL) == -1) + if (setitimer(timer_type, &interval, NULL) == -1) return -errno; return 0; @@ -33,10 +29,12 @@ int set_interval(int is_virtual) void disable_timer(void) { struct itimerval disable = ((struct itimerval) { { 0, 0 }, { 0, 0 }}); - if((setitimer(ITIMER_VIRTUAL, &disable, NULL) < 0) || - (setitimer(ITIMER_REAL, &disable, NULL) < 0)) - printk("disnable_timer - setitimer failed, errno = %d\n", - errno); + + if ((setitimer(ITIMER_VIRTUAL, &disable, NULL) < 0) || + (setitimer(ITIMER_REAL, &disable, NULL) < 0)) + printk(UM_KERN_ERR "disable_timer - setitimer failed, " + "errno = %d\n", errno); + /* If there are signals already queued, after unblocking ignore them */ signal(SIGALRM, SIG_IGN); signal(SIGVTALRM, SIG_IGN); @@ -49,7 +47,7 @@ void switch_timers(int to_real) { 0, 1000000/hz() }}); int old, new; - if(to_real){ + if (to_real) { old = ITIMER_VIRTUAL; new = ITIMER_REAL; } @@ -58,10 +56,10 @@ void switch_timers(int to_real) new = ITIMER_VIRTUAL; } - if((setitimer(old, &disable, NULL) < 0) || - (setitimer(new, &enable, NULL))) - printk("switch_timers - setitimer failed, errno = %d\n", - errno); + if ((setitimer(old, &disable, NULL) < 0) || + (setitimer(new, &enable, NULL))) + printk(UM_KERN_ERR "switch_timers - setitimer failed, " + "errno = %d\n", errno); } unsigned long long os_nsecs(void) @@ -69,7 +67,7 @@ unsigned long long os_nsecs(void) struct timeval tv; gettimeofday(&tv, NULL); - return((unsigned long long) tv.tv_sec * BILLION + tv.tv_usec * 1000); + return (unsigned long long) tv.tv_sec * BILLION + tv.tv_usec * 1000; } void idle_sleep(int secs) |