diff options
author | Steve French <sfrench@hera.kernel.org> | 2005-06-09 14:44:56 -0700 |
---|---|---|
committer | Steve French <sfrench@hera.kernel.org> | 2005-06-09 14:44:56 -0700 |
commit | f5d9b97ee0d6d00a29bf881263510d74291fb862 (patch) | |
tree | 90b22e6038da0ad40e54c3f52e8da67189730ae8 /arch/um/include/os.h | |
parent | 3079ca621e9e09f4593c20a9a2f24237c355f683 (diff) | |
parent | cf380ee7308db0f067ceb2ae8b852838788bf453 (diff) | |
download | kernel-crypto-f5d9b97ee0d6d00a29bf881263510d74291fb862.tar.gz kernel-crypto-f5d9b97ee0d6d00a29bf881263510d74291fb862.tar.xz kernel-crypto-f5d9b97ee0d6d00a29bf881263510d74291fb862.zip |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/um/include/os.h')
-rw-r--r-- | arch/um/include/os.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index d246d5a2460..881d2988d2d 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h @@ -136,7 +136,7 @@ extern int os_seek_file(int fd, __u64 offset); extern int os_open_file(char *file, struct openflags flags, int mode); extern int os_read_file(int fd, void *buf, int len); extern int os_write_file(int fd, const void *buf, int count); -extern int os_file_size(char *file, long long *size_out); +extern int os_file_size(char *file, unsigned long long *size_out); extern int os_file_modtime(char *file, unsigned long *modtime); extern int os_pipe(int *fd, int stream, int close_on_exec); extern int os_set_fd_async(int fd, int owner); |