From 88d73d2820f3a58c9c3bca82945ab37bdd819d7b Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 10 Jan 2007 23:15:45 -0800 Subject: [PATCH] --- yaml --- r: 45485 b: refs/heads/master c: aae7d14f619c665b83e07013e3dda8694ea3e40b h: refs/heads/master i: 45483: 4d7f6557468cead33b57690bab77b2ec9f5cb201 v: v3 --- [refs] | 2 +- trunk/include/asm-alpha/posix_types.h | 2 +- trunk/include/asm-ia64/posix_types.h | 2 +- trunk/include/asm-powerpc/posix_types.h | 2 +- trunk/include/asm-s390/posix_types.h | 2 +- trunk/include/asm-xtensa/posix_types.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 88070208e4f0..935b43fec9af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4f0ae0ea63caceff37a13f281a72652b7ea71ba +refs/heads/master: aae7d14f619c665b83e07013e3dda8694ea3e40b diff --git a/trunk/include/asm-alpha/posix_types.h b/trunk/include/asm-alpha/posix_types.h index c78c04a94f4e..db167413300b 100644 --- a/trunk/include/asm-alpha/posix_types.h +++ b/trunk/include/asm-alpha/posix_types.h @@ -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__ */ diff --git a/trunk/include/asm-ia64/posix_types.h b/trunk/include/asm-ia64/posix_types.h index adb62272694f..17885567b731 100644 --- a/trunk/include/asm-ia64/posix_types.h +++ b/trunk/include/asm-ia64/posix_types.h @@ -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__ */ diff --git a/trunk/include/asm-powerpc/posix_types.h b/trunk/include/asm-powerpc/posix_types.h index c6391077224f..2f2288f520be 100644 --- a/trunk/include/asm-powerpc/posix_types.h +++ b/trunk/include/asm-powerpc/posix_types.h @@ -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__ */ diff --git a/trunk/include/asm-s390/posix_types.h b/trunk/include/asm-s390/posix_types.h index b94c98856e12..397d93fba3a7 100644 --- a/trunk/include/asm-s390/posix_types.h +++ b/trunk/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__ */ diff --git a/trunk/include/asm-xtensa/posix_types.h b/trunk/include/asm-xtensa/posix_types.h index 3470b44c12ce..4ad77dda6d5f 100644 --- a/trunk/include/asm-xtensa/posix_types.h +++ b/trunk/include/asm-xtensa/posix_types.h @@ -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__ */