diff options
Diffstat (limited to 'arch/um/kernel/exitcode.c')
| -rw-r--r-- | arch/um/kernel/exitcode.c | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/arch/um/kernel/exitcode.c b/arch/um/kernel/exitcode.c index 6540d2c9fbb7..829df49dee99 100644 --- a/arch/um/kernel/exitcode.c +++ b/arch/um/kernel/exitcode.c | |||
| @@ -6,7 +6,9 @@ | |||
| 6 | #include <linux/ctype.h> | 6 | #include <linux/ctype.h> |
| 7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 9 | #include <linux/module.h> | ||
| 9 | #include <linux/proc_fs.h> | 10 | #include <linux/proc_fs.h> |
| 11 | #include <linux/seq_file.h> | ||
| 10 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 11 | #include <asm/uaccess.h> | 13 | #include <asm/uaccess.h> |
| 12 | 14 | ||
| @@ -16,30 +18,26 @@ | |||
| 16 | */ | 18 | */ |
| 17 | int uml_exitcode = 0; | 19 | int uml_exitcode = 0; |
| 18 | 20 | ||
| 19 | static int read_proc_exitcode(char *page, char **start, off_t off, | 21 | static int exitcode_proc_show(struct seq_file *m, void *v) |
| 20 | int count, int *eof, void *data) | ||
| 21 | { | 22 | { |
| 22 | int len, val; | 23 | int val; |
| 23 | 24 | ||
| 24 | /* | 25 | /* |
| 25 | * Save uml_exitcode in a local so that we don't need to guarantee | 26 | * Save uml_exitcode in a local so that we don't need to guarantee |
| 26 | * that sprintf accesses it atomically. | 27 | * that sprintf accesses it atomically. |
| 27 | */ | 28 | */ |
| 28 | val = uml_exitcode; | 29 | val = uml_exitcode; |
| 29 | len = sprintf(page, "%d\n", val); | 30 | seq_printf(m, "%d\n", val); |
| 30 | len -= off; | 31 | return 0; |
| 31 | if (len <= off+count) | 32 | } |
| 32 | *eof = 1; | 33 | |
| 33 | *start = page + off; | 34 | static int exitcode_proc_open(struct inode *inode, struct file *file) |
| 34 | if (len > count) | 35 | { |
| 35 | len = count; | 36 | return single_open(file, exitcode_proc_show, NULL); |
| 36 | if (len < 0) | ||
| 37 | len = 0; | ||
| 38 | return len; | ||
| 39 | } | 37 | } |
| 40 | 38 | ||
| 41 | static int write_proc_exitcode(struct file *file, const char __user *buffer, | 39 | static ssize_t exitcode_proc_write(struct file *file, |
| 42 | unsigned long count, void *data) | 40 | const char __user *buffer, size_t count, loff_t *pos) |
| 43 | { | 41 | { |
| 44 | char *end, buf[sizeof("nnnnn\0")]; | 42 | char *end, buf[sizeof("nnnnn\0")]; |
| 45 | int tmp; | 43 | int tmp; |
| @@ -55,20 +53,25 @@ static int write_proc_exitcode(struct file *file, const char __user *buffer, | |||
| 55 | return count; | 53 | return count; |
| 56 | } | 54 | } |
| 57 | 55 | ||
| 56 | static const struct file_operations exitcode_proc_fops = { | ||
| 57 | .owner = THIS_MODULE, | ||
| 58 | .open = exitcode_proc_open, | ||
| 59 | .read = seq_read, | ||
| 60 | .llseek = seq_lseek, | ||
| 61 | .release = single_release, | ||
| 62 | .write = exitcode_proc_write, | ||
| 63 | }; | ||
| 64 | |||
| 58 | static int make_proc_exitcode(void) | 65 | static int make_proc_exitcode(void) |
| 59 | { | 66 | { |
| 60 | struct proc_dir_entry *ent; | 67 | struct proc_dir_entry *ent; |
| 61 | 68 | ||
| 62 | ent = create_proc_entry("exitcode", 0600, NULL); | 69 | ent = proc_create("exitcode", 0600, NULL, &exitcode_proc_fops); |
| 63 | if (ent == NULL) { | 70 | if (ent == NULL) { |
| 64 | printk(KERN_WARNING "make_proc_exitcode : Failed to register " | 71 | printk(KERN_WARNING "make_proc_exitcode : Failed to register " |
| 65 | "/proc/exitcode\n"); | 72 | "/proc/exitcode\n"); |
| 66 | return 0; | 73 | return 0; |
| 67 | } | 74 | } |
| 68 | |||
| 69 | ent->read_proc = read_proc_exitcode; | ||
| 70 | ent->write_proc = write_proc_exitcode; | ||
| 71 | |||
| 72 | return 0; | 75 | return 0; |
| 73 | } | 76 | } |
| 74 | 77 | ||
