diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:03:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:03:55 -0400 |
commit | 46ee9645094ad1eb5b4888882ecaa1fb87dcd2a3 (patch) | |
tree | d0a48e993568b6a2415cfc21fc06eaa2fd886429 /include/linux/fs.h | |
parent | fa5312d9e87e7222c6c384c4e930dc149bc1178d (diff) | |
parent | 25f3a5a2854dce8b8413fd24cc9d5b9e3632be54 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: PM QOS update fix
Freezer / cgroup freezer: Update stale locking comments
PM / platform_bus: Allow runtime PM by default
i2c: Fix bus-level power management callbacks
PM QOS update
PM / Hibernate: Fix block_io.c printk warning
PM / Hibernate: Group swap ops
PM / Hibernate: Move the first_sector out of swsusp_write
PM / Hibernate: Separate block_io
PM / Hibernate: Snapshot cleanup
FS / libfs: Implement simple_write_to_buffer
PM / Hibernate: document open(/dev/snapshot) side effects
PM / Runtime: Add sysfs debug files
PM: Improve device power management document
PM: Update device power management document
PM: Allow runtime_suspend methods to call pm_schedule_suspend()
PM: pm_wakeup - switch to using bool
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 44f35aea2f1..948bd2bfb1d 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -2362,6 +2362,8 @@ extern void simple_release_fs(struct vfsmount **mount, int *count); | |||
2362 | 2362 | ||
2363 | extern ssize_t simple_read_from_buffer(void __user *to, size_t count, | 2363 | extern ssize_t simple_read_from_buffer(void __user *to, size_t count, |
2364 | loff_t *ppos, const void *from, size_t available); | 2364 | loff_t *ppos, const void *from, size_t available); |
2365 | extern ssize_t simple_write_to_buffer(void *to, size_t available, loff_t *ppos, | ||
2366 | const void __user *from, size_t count); | ||
2365 | 2367 | ||
2366 | extern int simple_fsync(struct file *, struct dentry *, int); | 2368 | extern int simple_fsync(struct file *, struct dentry *, int); |
2367 | 2369 | ||