summaryrefslogtreecommitdiff
path: root/include/asm-s390
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2007-01-10 23:15:45 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-11 18:18:22 -0800
commitaae7d14f619c665b83e07013e3dda8694ea3e40b (patch)
tree031a1a3210ed7a62662df79a806bb4f77e187f88 /include/asm-s390
parente4f0ae0ea63caceff37a13f281a72652b7ea71ba (diff)
downloadlinux-3.10-aae7d14f619c665b83e07013e3dda8694ea3e40b.tar.gz
linux-3.10-aae7d14f619c665b83e07013e3dda8694ea3e40b.tar.bz2
linux-3.10-aae7d14f619c665b83e07013e3dda8694ea3e40b.zip
[PATCH] FD_ZERO build fix
unionfs managed to hit this on s390. Some architectures use __ptr_t in their FD_ZERO implementation. We don't have a __ptr_t. Switch them over to plain old void*. Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-s390')
-rw-r--r--include/asm-s390/posix_types.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-s390/posix_types.h b/include/asm-s390/posix_types.h
index b94c98856e1..397d93fba3a 100644
--- a/include/asm-s390/posix_types.h
+++ b/include/asm-s390/posix_types.h
@@ -104,7 +104,7 @@ static inline int __FD_ISSET(unsigned long fd, const __kernel_fd_set *fdsetp)
#undef __FD_ZERO
#define __FD_ZERO(fdsetp) \
- ((void) memset ((__ptr_t) (fdsetp), 0, sizeof (__kernel_fd_set)))
+ ((void) memset ((void *) (fdsetp), 0, sizeof (__kernel_fd_set)))
#endif /* __KERNEL__ */