tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by Andrew Morton and committed by Linus Torvalds aae7d14f e4f0ae0e

+5 -5
unified split
+1 -1
include/asm-alpha/posix_types.h
··· 49 #define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d)) 50 #define __FD_ISSET(d, set) (((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) != 0) 51 #define __FD_ZERO(set) \ 52 - ((void) memset ((__ptr_t) (set), 0, sizeof (__kernel_fd_set))) 53 54 #else /* __GNUC__ */ 55
··· 49 #define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d)) 50 #define __FD_ISSET(d, set) (((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) != 0) 51 #define __FD_ZERO(set) \ 52 + ((void) memset ((void *) (set), 0, sizeof (__kernel_fd_set))) 53 54 #else /* __GNUC__ */ 55
+1 -1
include/asm-ia64/posix_types.h
··· 54 #define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d)) 55 #define __FD_ISSET(d, set) (((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) != 0) 56 #define __FD_ZERO(set) \ 57 - ((void) memset ((__ptr_t) (set), 0, sizeof (__kernel_fd_set))) 58 59 # else /* !__GNUC__ */ 60
··· 54 #define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d)) 55 #define __FD_ISSET(d, set) (((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) != 0) 56 #define __FD_ZERO(set) \ 57 + ((void) memset ((void *) (set), 0, sizeof (__kernel_fd_set))) 58 59 # else /* !__GNUC__ */ 60
+1 -1
include/asm-powerpc/posix_types.h
··· 60 #define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d)) 61 #define __FD_ISSET(d, set) (((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) != 0) 62 #define __FD_ZERO(set) \ 63 - ((void) memset ((__ptr_t) (set), 0, sizeof (__kernel_fd_set))) 64 65 #else /* __GNUC__ */ 66
··· 60 #define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d)) 61 #define __FD_ISSET(d, set) (((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) != 0) 62 #define __FD_ZERO(set) \ 63 + ((void) memset ((void *) (set), 0, sizeof (__kernel_fd_set))) 64 65 #else /* __GNUC__ */ 66
+1 -1
include/asm-s390/posix_types.h
··· 104 105 #undef __FD_ZERO 106 #define __FD_ZERO(fdsetp) \ 107 - ((void) memset ((__ptr_t) (fdsetp), 0, sizeof (__kernel_fd_set))) 108 109 #endif /* __KERNEL__ */ 110
··· 104 105 #undef __FD_ZERO 106 #define __FD_ZERO(fdsetp) \ 107 + ((void) memset ((void *) (fdsetp), 0, sizeof (__kernel_fd_set))) 108 109 #endif /* __KERNEL__ */ 110
+1 -1
include/asm-xtensa/posix_types.h
··· 60 #define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d)) 61 #define __FD_ISSET(d, set) ((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) 62 #define __FD_ZERO(set) \ 63 - ((void) memset ((__ptr_t) (set), 0, sizeof (__kernel_fd_set))) 64 65 #else /* __GNUC__ */ 66
··· 60 #define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d)) 61 #define __FD_ISSET(d, set) ((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) 62 #define __FD_ZERO(set) \ 63 + ((void) memset ((void *) (set), 0, sizeof (__kernel_fd_set))) 64 65 #else /* __GNUC__ */ 66