powerpc: Use generic posix_types.h
Change the powerpc architecture to use <asm-generic/posix_types.h>. [ v2: fix the definition for __kernel_ssize_t ] Signed-off-by: H. Peter Anvin <hpa@zytor.com> Link: http://lkml.kernel.org/r/1328677745-20121-16-git-send-email-hpa@zytor.com Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
f4f0727b75
commit
fae89ee8d7
|
@ -7,122 +7,22 @@
|
||||||
* assume GCC is being used.
|
* assume GCC is being used.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef unsigned long __kernel_ino_t;
|
|
||||||
typedef unsigned int __kernel_mode_t;
|
|
||||||
typedef long __kernel_off_t;
|
|
||||||
typedef int __kernel_pid_t;
|
|
||||||
typedef unsigned int __kernel_uid_t;
|
|
||||||
typedef unsigned int __kernel_gid_t;
|
|
||||||
typedef long __kernel_ptrdiff_t;
|
|
||||||
typedef long __kernel_time_t;
|
|
||||||
typedef long __kernel_clock_t;
|
|
||||||
typedef int __kernel_timer_t;
|
|
||||||
typedef int __kernel_clockid_t;
|
|
||||||
typedef long __kernel_suseconds_t;
|
|
||||||
typedef int __kernel_daddr_t;
|
|
||||||
typedef char * __kernel_caddr_t;
|
|
||||||
typedef unsigned short __kernel_uid16_t;
|
|
||||||
typedef unsigned short __kernel_gid16_t;
|
|
||||||
typedef unsigned int __kernel_uid32_t;
|
|
||||||
typedef unsigned int __kernel_gid32_t;
|
|
||||||
typedef unsigned int __kernel_old_uid_t;
|
|
||||||
typedef unsigned int __kernel_old_gid_t;
|
|
||||||
|
|
||||||
#ifdef __powerpc64__
|
#ifdef __powerpc64__
|
||||||
typedef unsigned long __kernel_nlink_t;
|
|
||||||
typedef int __kernel_ipc_pid_t;
|
|
||||||
typedef unsigned long __kernel_size_t;
|
|
||||||
typedef long __kernel_ssize_t;
|
|
||||||
typedef unsigned long __kernel_old_dev_t;
|
typedef unsigned long __kernel_old_dev_t;
|
||||||
|
#define __kernel_old_dev_t __kernel_old_dev_t
|
||||||
#else
|
#else
|
||||||
typedef unsigned short __kernel_nlink_t;
|
|
||||||
typedef short __kernel_ipc_pid_t;
|
|
||||||
typedef unsigned int __kernel_size_t;
|
typedef unsigned int __kernel_size_t;
|
||||||
typedef int __kernel_ssize_t;
|
typedef int __kernel_ssize_t;
|
||||||
typedef unsigned int __kernel_old_dev_t;
|
typedef long __kernel_ptrdiff_t;
|
||||||
|
#define __kernel_size_t __kernel_size_t
|
||||||
|
|
||||||
|
typedef unsigned short __kernel_nlink_t;
|
||||||
|
#define __kernel_nlink_t __kernel_nlink_t
|
||||||
|
|
||||||
|
typedef short __kernel_ipc_pid_t;
|
||||||
|
#define __kernel_ipc_pid_t __kernel_ipc_pid_t
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __powerpc64__
|
#include <asm-generic/posix_types.h>
|
||||||
typedef long long __kernel_loff_t;
|
|
||||||
#else
|
|
||||||
#ifdef __GNUC__
|
|
||||||
typedef long long __kernel_loff_t;
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
int val[2];
|
|
||||||
} __kernel_fsid_t;
|
|
||||||
|
|
||||||
#ifndef __GNUC__
|
|
||||||
|
|
||||||
#define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
|
|
||||||
#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 ((void *) (set), 0, sizeof (__kernel_fd_set)))
|
|
||||||
|
|
||||||
#else /* __GNUC__ */
|
|
||||||
|
|
||||||
#if defined(__KERNEL__)
|
|
||||||
/* With GNU C, use inline functions instead so args are evaluated only once: */
|
|
||||||
|
|
||||||
#undef __FD_SET
|
|
||||||
static __inline__ void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp)
|
|
||||||
{
|
|
||||||
unsigned long _tmp = fd / __NFDBITS;
|
|
||||||
unsigned long _rem = fd % __NFDBITS;
|
|
||||||
fdsetp->fds_bits[_tmp] |= (1UL<<_rem);
|
|
||||||
}
|
|
||||||
|
|
||||||
#undef __FD_CLR
|
|
||||||
static __inline__ void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp)
|
|
||||||
{
|
|
||||||
unsigned long _tmp = fd / __NFDBITS;
|
|
||||||
unsigned long _rem = fd % __NFDBITS;
|
|
||||||
fdsetp->fds_bits[_tmp] &= ~(1UL<<_rem);
|
|
||||||
}
|
|
||||||
|
|
||||||
#undef __FD_ISSET
|
|
||||||
static __inline__ int __FD_ISSET(unsigned long fd, __kernel_fd_set *p)
|
|
||||||
{
|
|
||||||
unsigned long _tmp = fd / __NFDBITS;
|
|
||||||
unsigned long _rem = fd % __NFDBITS;
|
|
||||||
return (p->fds_bits[_tmp] & (1UL<<_rem)) != 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This will unroll the loop for the normal constant case (8 ints,
|
|
||||||
* for a 256-bit fd_set)
|
|
||||||
*/
|
|
||||||
#undef __FD_ZERO
|
|
||||||
static __inline__ void __FD_ZERO(__kernel_fd_set *p)
|
|
||||||
{
|
|
||||||
unsigned long *tmp = (unsigned long *)p->fds_bits;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if (__builtin_constant_p(__FDSET_LONGS)) {
|
|
||||||
switch (__FDSET_LONGS) {
|
|
||||||
case 16:
|
|
||||||
tmp[12] = 0; tmp[13] = 0; tmp[14] = 0; tmp[15] = 0;
|
|
||||||
tmp[ 8] = 0; tmp[ 9] = 0; tmp[10] = 0; tmp[11] = 0;
|
|
||||||
|
|
||||||
case 8:
|
|
||||||
tmp[ 4] = 0; tmp[ 5] = 0; tmp[ 6] = 0; tmp[ 7] = 0;
|
|
||||||
|
|
||||||
case 4:
|
|
||||||
tmp[ 0] = 0; tmp[ 1] = 0; tmp[ 2] = 0; tmp[ 3] = 0;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
i = __FDSET_LONGS;
|
|
||||||
while (i) {
|
|
||||||
i--;
|
|
||||||
*tmp = 0;
|
|
||||||
tmp++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* defined(__KERNEL__) */
|
|
||||||
#endif /* __GNUC__ */
|
|
||||||
#endif /* _ASM_POWERPC_POSIX_TYPES_H */
|
#endif /* _ASM_POWERPC_POSIX_TYPES_H */
|
||||||
|
|
Loading…
Reference in a new issue