Commit 52c73782 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds

[PATCH] uml: avoid warnings for diffent names for an unsigned quadword

Since on some 64-bit systems __u64 is rightfully defined to unsigned long and
GCC recognizes anyway unsigned long and unsigned long long as different, fix
some types back to being unsigned long long to avoid warnings and errors (for
prototype mismatch) on those systems.

Thanks to the report by Wesley Emeneker wesleyemeneker (at) google (dot) com
Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 40dbb867
...@@ -46,7 +46,7 @@ extern int file_reader(__u64 offset, char *buf, int len, void *arg); ...@@ -46,7 +46,7 @@ extern int file_reader(__u64 offset, char *buf, int len, void *arg);
extern int read_cow_header(int (*reader)(__u64, char *, int, void *), extern int read_cow_header(int (*reader)(__u64, char *, int, void *),
void *arg, __u32 *version_out, void *arg, __u32 *version_out,
char **backing_file_out, time_t *mtime_out, char **backing_file_out, time_t *mtime_out,
__u64 *size_out, int *sectorsize_out, unsigned long long *size_out, int *sectorsize_out,
__u32 *align_out, int *bitmap_offset_out); __u32 *align_out, int *bitmap_offset_out);
extern int write_cow_header(char *cow_file, int fd, char *backing_file, extern int write_cow_header(char *cow_file, int fd, char *backing_file,
......
...@@ -28,7 +28,7 @@ static inline int cow_seek_file(int fd, __u64 offset) ...@@ -28,7 +28,7 @@ static inline int cow_seek_file(int fd, __u64 offset)
return(os_seek_file(fd, offset)); return(os_seek_file(fd, offset));
} }
static inline int cow_file_size(char *file, __u64 *size_out) static inline int cow_file_size(char *file, unsigned long long *size_out)
{ {
return(os_file_size(file, size_out)); return(os_file_size(file, size_out));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment