Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aae7d14f authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e4f0ae0e

include/asm-alpha/posix_types.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ typedef unsigned int __kernel_old_dev_t; 
#define	__FD_CLR(d, set)	((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))

#define	__FD_ISSET(d, set)	(((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) != 0)

#define	__FD_ZERO(set)	\

  ((void) memset ((__ptr_t) (set), 0, sizeof (__kernel_fd_set)))

  ((void) memset ((void *) (set), 0, sizeof (__kernel_fd_set)))



#else /* __GNUC__ */

include/asm-ia64/posix_types.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ typedef unsigned int __kernel_old_dev_t; 
#define	__FD_CLR(d, set)	((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))

#define	__FD_ISSET(d, set)	(((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) != 0)

#define	__FD_ZERO(set)	\

  ((void) memset ((__ptr_t) (set), 0, sizeof (__kernel_fd_set)))

  ((void) memset ((void *) (set), 0, sizeof (__kernel_fd_set)))



#  else /* !__GNUC__ */

include/asm-powerpc/posix_types.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ typedef struct { 
#define	__FD_CLR(d, set)	((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))

#define	__FD_ISSET(d, set)	(((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) != 0)

#define	__FD_ZERO(set)	\

  ((void) memset ((__ptr_t) (set), 0, sizeof (__kernel_fd_set)))

  ((void) memset ((void *) (set), 0, sizeof (__kernel_fd_set)))



#else /* __GNUC__ */

include/asm-s390/posix_types.h

+1 −1
Original line number Diff line number Diff line
@@ -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__ */

include/asm-xtensa/posix_types.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ typedef struct { 
#define	__FD_CLR(d, set)	((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))

#define	__FD_ISSET(d, set)	((set)->fds_bits[__FDELT(d)] & __FDMASK(d))

#define	__FD_ZERO(set)	\

  ((void) memset ((__ptr_t) (set), 0, sizeof (__kernel_fd_set)))

  ((void) memset ((void *) (set), 0, sizeof (__kernel_fd_set)))



#else /* __GNUC__ */