diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
| commit | f45ac22ae2b8fc5b4c32d9b8d17ea419a8701d89 (patch) | |
| tree | 8e05bccd7b85fc3dd2fbd33ec3286de27e152819 /fs/binfmt_misc.c | |
| parent | 79f3b3cb7a2586b319a43a7f29924c6c555e4357 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into x86/urgent
Diffstat (limited to 'fs/binfmt_misc.c')
| -rw-r--r-- | fs/binfmt_misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index e1158cb4fbd6..c4e83537ead7 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c | |||
| @@ -649,7 +649,7 @@ static const struct file_operations bm_register_operations = { | |||
| 649 | static ssize_t | 649 | static ssize_t |
| 650 | bm_status_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) | 650 | bm_status_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) |
| 651 | { | 651 | { |
| 652 | char *s = enabled ? "enabled" : "disabled"; | 652 | char *s = enabled ? "enabled\n" : "disabled\n"; |
| 653 | 653 | ||
| 654 | return simple_read_from_buffer(buf, nbytes, ppos, s, strlen(s)); | 654 | return simple_read_from_buffer(buf, nbytes, ppos, s, strlen(s)); |
| 655 | } | 655 | } |