aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/kernel
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-06-08 16:46:54 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-08 20:23:33 -0400
commite16f5350d4cf402cffd18898b07c3b72917db192 (patch)
tree402b737c7cb0237c9cbc64882ac518ae2b067a4c /arch/um/kernel
parent49277b1c68f9bd22119a5174a68254ec1b39d8c2 (diff)
uml: get declaration of simple_strtoul
Include linux/kernel.h wherever simple_strtoul is used. This kills a compile warning in stderr_console.c and potential ones in the other files. This also fixes a bunch of style violations in exitcode.c. 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/kernel')
-rw-r--r--arch/um/kernel/exitcode.c39
1 files changed, 17 insertions, 22 deletions
diff --git a/arch/um/kernel/exitcode.c b/arch/um/kernel/exitcode.c
index 8b7f2cdedf94..c716b5a6db13 100644
--- a/arch/um/kernel/exitcode.c
+++ b/arch/um/kernel/exitcode.c
@@ -1,8 +1,9 @@
1/* 1/*
2 * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) 2 * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
3 * Licensed under the GPL 3 * Licensed under the GPL
4 */ 4 */
5 5
6#include "linux/kernel.h"
6#include "linux/init.h" 7#include "linux/init.h"
7#include "linux/ctype.h" 8#include "linux/ctype.h"
8#include "linux/proc_fs.h" 9#include "linux/proc_fs.h"
@@ -24,11 +25,14 @@ static int read_proc_exitcode(char *page, char **start, off_t off,
24 val = uml_exitcode; 25 val = uml_exitcode;
25 len = sprintf(page, "%d\n", val); 26 len = sprintf(page, "%d\n", val);
26 len -= off; 27 len -= off;
27 if(len <= off+count) *eof = 1; 28 if(len <= off+count)
29 *eof = 1;
28 *start = page + off; 30 *start = page + off;
29 if(len > count) len = count; 31 if(len > count)
30 if(len < 0) len = 0; 32 len = count;
31 return(len); 33 if(len < 0)
34 len = 0;
35 return len;
32} 36}
33 37
34static int write_proc_exitcode(struct file *file, const char __user *buffer, 38static int write_proc_exitcode(struct file *file, const char __user *buffer,
@@ -38,12 +42,14 @@ static int write_proc_exitcode(struct file *file, const char __user *buffer,
38 int tmp; 42 int tmp;
39 43
40 if(copy_from_user(buf, buffer, count)) 44 if(copy_from_user(buf, buffer, count))
41 return(-EFAULT); 45 return -EFAULT;
46
42 tmp = simple_strtol(buf, &end, 0); 47 tmp = simple_strtol(buf, &end, 0);
43 if((*end != '\0') && !isspace(*end)) 48 if((*end != '\0') && !isspace(*end))
44 return(-EINVAL); 49 return -EINVAL;
50
45 uml_exitcode = tmp; 51 uml_exitcode = tmp;
46 return(count); 52 return count;
47} 53}
48 54
49static int make_proc_exitcode(void) 55static int make_proc_exitcode(void)
@@ -54,24 +60,13 @@ static int make_proc_exitcode(void)
54 if(ent == NULL){ 60 if(ent == NULL){
55 printk(KERN_WARNING "make_proc_exitcode : Failed to register " 61 printk(KERN_WARNING "make_proc_exitcode : Failed to register "
56 "/proc/exitcode\n"); 62 "/proc/exitcode\n");
57 return(0); 63 return 0;
58 } 64 }
59 65
60 ent->read_proc = read_proc_exitcode; 66 ent->read_proc = read_proc_exitcode;
61 ent->write_proc = write_proc_exitcode; 67 ent->write_proc = write_proc_exitcode;
62 68
63 return(0); 69 return 0;
64} 70}
65 71
66__initcall(make_proc_exitcode); 72__initcall(make_proc_exitcode);
67
68/*
69 * Overrides for Emacs so that we follow Linus's tabbing style.
70 * Emacs will notice this stuff at the end of the file and automatically
71 * adjust the settings for this buffer only. This must remain at the end
72 * of the file.
73 * ---------------------------------------------------------------------------
74 * Local variables:
75 * c-file-style: "linux"
76 * End:
77 */