diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-21 10:05:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-21 10:05:35 -0700 |
| commit | c089b229dfdd09d59a11d8bc2344bf8196d575ce (patch) | |
| tree | f7f1c0bd99721564a93092406801310617a6c72b /arch/um/include/shared/os.h | |
| parent | 9ac03675010a69507c0a9d832d6a722e07d35cc6 (diff) | |
| parent | 0565103d1adbd765ca45248d04c327c076dd1571 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML fixes from Richard Weinberger:
"Assorted fixes for UML"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Memory corruption on startup
um: Missing pipe handling
uml: Simplify tempdir logic.
Diffstat (limited to 'arch/um/include/shared/os.h')
| -rw-r--r-- | arch/um/include/shared/os.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h index 75298d3358e..08eec0b691b 100644 --- a/arch/um/include/shared/os.h +++ b/arch/um/include/shared/os.h @@ -136,6 +136,7 @@ extern int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg); extern int os_get_ifname(int fd, char *namebuf); extern int os_set_slip(int fd); extern int os_mode_fd(int fd, int mode); +extern int os_fsync_file(int fd); extern int os_seek_file(int fd, unsigned long long offset); extern int os_open_file(const char *file, struct openflags flags, int mode); |