summaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/cow_sys.h
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2006-04-11 07:53:41 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 15:18:37 +0200
commit52c7378236103ce5fbfb7b3e6ac46aa9de9f970d (patch)
tree7b61a8c0521395b2c32507816625d92ac4ff3363 /arch/um/drivers/cow_sys.h
parent[PATCH] uml: fix parallel make early failure on clean tree (diff)
downloadlinux-52c7378236103ce5fbfb7b3e6ac46aa9de9f970d.tar.xz
linux-52c7378236103ce5fbfb7b3e6ac46aa9de9f970d.zip
[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: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/drivers/cow_sys.h')
-rw-r--r--arch/um/drivers/cow_sys.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h
index 94de4ead4f7a..7a5b4afde692 100644
--- a/arch/um/drivers/cow_sys.h
+++ b/arch/um/drivers/cow_sys.h
@@ -28,7 +28,7 @@ static inline int cow_seek_file(int fd, __u64 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));
}