diff options
| author | Alex Elder <aelder@sgi.com> | 2010-10-21 09:29:34 -0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-10-21 09:29:34 -0400 |
| commit | 39dc948c6921169e13224a97fa53188922acfde8 (patch) | |
| tree | ef9c310031ebc21321d9f10ca6afea90d37a2f57 /fs | |
| parent | a731cd116c9334e01bcf3e676c0c621fe7de6ce4 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge branch 'v2.6.36'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/exec.c | 2 |
1 files changed, 2 insertions, 0 deletions
| @@ -2024,6 +2024,7 @@ int dump_write(struct file *file, const void *addr, int nr) | |||
| 2024 | { | 2024 | { |
| 2025 | return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr; | 2025 | return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr; |
| 2026 | } | 2026 | } |
| 2027 | EXPORT_SYMBOL(dump_write); | ||
| 2027 | 2028 | ||
| 2028 | int dump_seek(struct file *file, loff_t off) | 2029 | int dump_seek(struct file *file, loff_t off) |
| 2029 | { | 2030 | { |
| @@ -2052,3 +2053,4 @@ int dump_seek(struct file *file, loff_t off) | |||
| 2052 | } | 2053 | } |
| 2053 | return ret; | 2054 | return ret; |
| 2054 | } | 2055 | } |
| 2056 | EXPORT_SYMBOL(dump_seek); | ||
