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

Commit 86fcd10e authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

mips: Use generic posix_types.h 



Change the mips architecture to use <asm-generic/posix_types.h>.

[ v2: remove redundant definition of __kernel_loff_t ]

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Link: http://lkml.kernel.org/r/1328677745-20121-13-git-send-email-hpa@zytor.com
Cc: Ralf Baechle <ralf@linux-mips.org>
parent 08a655ca

arch/mips/include/asm/posix_types.h

+7 −114
Original line number Original line Diff line number Diff line
@@ -17,128 +17,21 @@ 
 * assume GCC is being used.

 * assume GCC is being used.

 */

 */





typedef unsigned long	__kernel_ino_t;

typedef unsigned int	__kernel_mode_t;

#if (_MIPS_SZLONG == 32)

typedef unsigned long	__kernel_nlink_t;

#endif

#if (_MIPS_SZLONG == 64)

#if (_MIPS_SZLONG == 64)

typedef unsigned int	__kernel_nlink_t;

typedef unsigned int	__kernel_nlink_t;

#define __kernel_nlink_t __kernel_nlink_t

#endif

#endif

typedef long		__kernel_off_t;

typedef int		__kernel_pid_t;

typedef int		__kernel_ipc_pid_t;

typedef unsigned int	__kernel_uid_t;

typedef unsigned int	__kernel_gid_t;

#if (_MIPS_SZLONG == 32)

typedef unsigned int	__kernel_size_t;

typedef int		__kernel_ssize_t;

typedef int		__kernel_ptrdiff_t;

#endif

#if (_MIPS_SZLONG == 64)

typedef unsigned long	__kernel_size_t;

typedef long		__kernel_ssize_t;

typedef long		__kernel_ptrdiff_t;

#endif

typedef long		__kernel_time_t;

typedef long		__kernel_suseconds_t;

typedef long		__kernel_clock_t;

typedef int		__kernel_timer_t;

typedef int		__kernel_clockid_t;

typedef long		__kernel_daddr_t;

typedef char *		__kernel_caddr_t;





typedef unsigned short	__kernel_uid16_t;

typedef long		__kernel_daddr_t;

typedef unsigned short	__kernel_gid16_t;

#define __kernel_daddr_t __kernel_daddr_t

typedef unsigned int	__kernel_uid32_t;

typedef unsigned int	__kernel_gid32_t;

typedef __kernel_uid_t	__kernel_old_uid_t;

typedef __kernel_gid_t	__kernel_old_gid_t;

typedef unsigned int	__kernel_old_dev_t;



#ifdef __GNUC__

typedef long long      __kernel_loff_t;

#endif





typedef struct {

#if (_MIPS_SZLONG == 32)

#if (_MIPS_SZLONG == 32)

typedef struct {

	long	val[2];

	long	val[2];

#endif

#if (_MIPS_SZLONG == 64)

	int	val[2];

#endif

} __kernel_fsid_t;

} __kernel_fsid_t;

#define __kernel_fsid_t __kernel_fsid_t

#endif





#if defined(__KERNEL__)

#include <asm-generic/posix_types.h>



#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, const __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 = __p->fds_bits;

	int __i;



	if (__builtin_constant_p(__FDSET_LONGS)) {

		switch (__FDSET_LONGS) {

		case 16:

			__tmp[ 0] = 0; __tmp[ 1] = 0;

			__tmp[ 2] = 0; __tmp[ 3] = 0;

			__tmp[ 4] = 0; __tmp[ 5] = 0;

			__tmp[ 6] = 0; __tmp[ 7] = 0;

			__tmp[ 8] = 0; __tmp[ 9] = 0;

			__tmp[10] = 0; __tmp[11] = 0;

			__tmp[12] = 0; __tmp[13] = 0;

			__tmp[14] = 0; __tmp[15] = 0;

			return;



		case 8:

			__tmp[ 0] = 0; __tmp[ 1] = 0;

			__tmp[ 2] = 0; __tmp[ 3] = 0;

			__tmp[ 4] = 0; __tmp[ 5] = 0;

			__tmp[ 6] = 0; __tmp[ 7] = 0;

			return;



		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 /* _ASM_POSIX_TYPES_H */
 
#endif /* _ASM_POSIX_TYPES_H */