Merge branch 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / arch / um / kernel / exitcode.c

diff --git a/arch/um/kernel/exitcode.c b/arch/um/kernel/exitcode.c
index c716b5a6db13d9552a59e7f7ec5688229ca9bf0e..6540d2c9fbb76f684db03539e26e202178cf18f5 100644 (file)
--- a/arch/um/kernel/exitcode.c
+++ b/arch/um/kernel/exitcode.c
@@ -1,15 +1,17 @@
 /*
- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include "linux/kernel.h"
-#include "linux/init.h"
-#include "linux/ctype.h"
-#include "linux/proc_fs.h"
-#include "asm/uaccess.h"
+#include <linux/ctype.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/proc_fs.h>
+#include <linux/types.h>
+#include <asm/uaccess.h>
 
-/* If read and write race, the read will still atomically read a valid
+/*
+ * If read and write race, the read will still atomically read a valid
  * value.
  */
 int uml_exitcode = 0;
@@ -19,18 +21,19 @@ static int read_proc_exitcode(char *page, char **start, off_t off,
 {
        int len, val;
 
-       /* Save uml_exitcode in a local so that we don't need to guarantee
+       /*
+        * Save uml_exitcode in a local so that we don't need to guarantee
         * that sprintf accesses it atomically.
         */
        val = uml_exitcode;
        len = sprintf(page, "%d\n", val);
        len -= off;
-       if(len <= off+count)
+       if (len <= off+count)
                *eof = 1;
        *start = page + off;
-       if(len > count)
+       if (len > count)
                len = count;
-       if(len < 0)
+       if (len < 0)
                len = 0;
        return len;
 }
@@ -41,11 +44,11 @@ static int write_proc_exitcode(struct file *file, const char __user *buffer,
        char *end, buf[sizeof("nnnnn\0")];
        int tmp;
 
-       if(copy_from_user(buf, buffer, count))
+       if (copy_from_user(buf, buffer, count))
                return -EFAULT;
 
        tmp = simple_strtol(buf, &end, 0);
-       if((*end != '\0') && !isspace(*end))
+       if ((*end != '\0') && !isspace(*end))
                return -EINVAL;
 
        uml_exitcode = tmp;
@@ -56,8 +59,8 @@ static int make_proc_exitcode(void)
 {
        struct proc_dir_entry *ent;
 
-       ent = create_proc_entry("exitcode", 0600, &proc_root);
-       if(ent == NULL){
+       ent = create_proc_entry("exitcode", 0600, NULL);
+       if (ent == NULL) {
                printk(KERN_WARNING "make_proc_exitcode : Failed to register "
                       "/proc/exitcode\n");
                return 0;