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

Commit e898c670 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/x32' into x86/cleanups 



Merge reason: We are going to merge a dependent patch.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents c9408265 55283e25

Documentation/filesystems/files.txt

+2 −2
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ the fdtable structure - 
	if (fd >= 0) {

		/* locate_fd() may have expanded fdtable, load the ptr */

		fdt = files_fdtable(files);

		FD_SET(fd, fdt->open_fds);

		FD_CLR(fd, fdt->close_on_exec);

		__set_open_fd(fd, fdt);

		__clear_close_on_exec(fd, fdt);

		spin_unlock(&files->file_lock);

	.....

arch/alpha/include/asm/posix_types.h

+5 −108
Original line number Diff line number Diff line
@@ -8,116 +8,13 @@ 
 */



typedef unsigned int	__kernel_ino_t;

typedef unsigned int	__kernel_mode_t;

typedef unsigned int	__kernel_nlink_t;

typedef long		__kernel_off_t;

typedef long long	__kernel_loff_t;

typedef int		__kernel_pid_t;

typedef int		__kernel_ipc_pid_t;

typedef unsigned int	__kernel_uid_t;

typedef unsigned int	__kernel_gid_t;

typedef unsigned long	__kernel_size_t;

typedef long		__kernel_ssize_t;

typedef long		__kernel_ptrdiff_t;

typedef long		__kernel_time_t;

typedef long		__kernel_suseconds_t;

typedef long		__kernel_clock_t;

typedef int		__kernel_daddr_t;

typedef char *		__kernel_caddr_t;

typedef unsigned long	__kernel_sigset_t;	/* at least 32 bits */

typedef unsigned short	__kernel_uid16_t;

typedef unsigned short	__kernel_gid16_t;

typedef int		__kernel_clockid_t;

typedef int		__kernel_timer_t;



typedef struct {

	int	val[2];

} __kernel_fsid_t;



typedef __kernel_uid_t __kernel_old_uid_t;

typedef __kernel_gid_t __kernel_old_gid_t;

typedef __kernel_uid_t __kernel_uid32_t;

typedef __kernel_gid_t __kernel_gid32_t;



typedef unsigned int	__kernel_old_dev_t;



#ifdef __KERNEL__



#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__ */



/* With GNU C, use inline functions instead so args are evaluated only once: */

#define __kernel_ino_t __kernel_ino_t



#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++;

	}

}

typedef unsigned int	__kernel_nlink_t;

#define __kernel_nlink_t __kernel_nlink_t



#endif /* __GNUC__ */

typedef unsigned long	__kernel_sigset_t;	/* at least 32 bits */



#endif /* __KERNEL__ */

#include <asm-generic/posix_types.h>



#endif /* _ALPHA_POSIX_TYPES_H */

arch/arm/include/asm/posix_types.h

+9 −46
Original line number Diff line number Diff line
@@ -19,59 +19,22 @@ 
 * assume GCC is being used.

 */



typedef unsigned long		__kernel_ino_t;

typedef unsigned short		__kernel_mode_t;

#define __kernel_mode_t __kernel_mode_t



typedef unsigned short		__kernel_nlink_t;

typedef long			__kernel_off_t;

typedef int			__kernel_pid_t;

#define __kernel_nlink_t __kernel_nlink_t



typedef unsigned short		__kernel_ipc_pid_t;

#define __kernel_ipc_pid_t __kernel_ipc_pid_t



typedef unsigned short		__kernel_uid_t;

typedef unsigned short		__kernel_gid_t;

typedef unsigned int		__kernel_size_t;

typedef int			__kernel_ssize_t;

typedef int			__kernel_ptrdiff_t;

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

#define __kernel_uid_t __kernel_uid_t



typedef unsigned short		__kernel_old_uid_t;

typedef unsigned short		__kernel_old_gid_t;

typedef unsigned short		__kernel_old_dev_t;

#define __kernel_old_dev_t __kernel_old_dev_t



#ifdef __GNUC__

typedef long long		__kernel_loff_t;

#endif



typedef struct {

	int	val[2];

} __kernel_fsid_t;



#if defined(__KERNEL__)



#undef	__FD_SET

#define __FD_SET(fd, fdsetp) \

		(((fd_set *)(fdsetp))->fds_bits[(fd) >> 5] |= (1<<((fd) & 31)))



#undef	__FD_CLR

#define __FD_CLR(fd, fdsetp) \

		(((fd_set *)(fdsetp))->fds_bits[(fd) >> 5] &= ~(1<<((fd) & 31)))



#undef	__FD_ISSET

#define __FD_ISSET(fd, fdsetp) \

		((((fd_set *)(fdsetp))->fds_bits[(fd) >> 5] & (1<<((fd) & 31))) != 0)



#undef	__FD_ZERO

#define __FD_ZERO(fdsetp) \

		(memset (fdsetp, 0, sizeof (*(fd_set *)(fdsetp))))



#endif

#include <asm-generic/posix_types.h>



#endif

arch/avr32/include/asm/posix_types.h

+11 −96
Original line number Diff line number Diff line
@@ -14,112 +14,27 @@ 
 * assume GCC is being used.

 */



typedef unsigned long   __kernel_ino_t;

typedef unsigned short  __kernel_mode_t;

#define __kernel_mode_t __kernel_mode_t



typedef unsigned short  __kernel_nlink_t;

typedef long            __kernel_off_t;

typedef int             __kernel_pid_t;

#define __kernel_nlink_t __kernel_nlink_t



typedef unsigned short  __kernel_ipc_pid_t;

typedef unsigned int	__kernel_uid_t;

typedef unsigned int	__kernel_gid_t;

#define __kernel_ipc_pid_t __kernel_ipc_pid_t



typedef unsigned long	__kernel_size_t;

typedef long		__kernel_ssize_t;

typedef int             __kernel_ptrdiff_t;

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

#define __kernel_size_t __kernel_size_t



typedef unsigned short  __kernel_old_uid_t;

typedef unsigned short  __kernel_old_gid_t;

typedef unsigned short  __kernel_old_dev_t;



#ifdef __GNUC__

typedef long long       __kernel_loff_t;

#endif



typedef struct {

    int     val[2];

} __kernel_fsid_t;



#if defined(__KERNEL__)



#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);

}

#define __kernel_old_uid_t __kernel_old_uid_t



typedef unsigned short  __kernel_old_dev_t;

#define __kernel_old_dev_t __kernel_old_dev_t



#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__) */

#include <asm-generic/posix_types.h>



#endif /* __ASM_AVR32_POSIX_TYPES_H */

arch/cris/include/asm/posix_types.h

+10 −40
Original line number Diff line number Diff line
@@ -12,55 +12,25 @@ 
 * assume GCC is being used.

 */



typedef unsigned long	__kernel_ino_t;

typedef unsigned short	__kernel_mode_t;

#define __kernel_mode_t __kernel_mode_t



typedef unsigned short	__kernel_nlink_t;

typedef long		__kernel_off_t;

typedef int		__kernel_pid_t;

#define __kernel_nlink_t __kernel_nlink_t



typedef unsigned short  __kernel_ipc_pid_t;

#define __kernel_ipc_pid_t __kernel_ipc_pid_t



typedef unsigned short	__kernel_uid_t;

typedef unsigned short	__kernel_gid_t;

#define __kernel_uid_t __kernel_uid_t



typedef __SIZE_TYPE__	__kernel_size_t;

typedef long		__kernel_ssize_t;

typedef int		__kernel_ptrdiff_t;

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

#define __kernel_size_t __kernel_size_t



typedef unsigned short  __kernel_old_uid_t;

typedef unsigned short  __kernel_old_gid_t;

typedef unsigned short	__kernel_old_dev_t;



#ifdef __GNUC__

typedef long long	__kernel_loff_t;

#endif



typedef struct {

	int	val[2];

} __kernel_fsid_t;



#ifdef __KERNEL__



#undef	__FD_SET

#define __FD_SET(fd,fdsetp) set_bit(fd, (void *)(fdsetp))



#undef	__FD_CLR

#define __FD_CLR(fd,fdsetp) clear_bit(fd, (void *)(fdsetp))



#undef	__FD_ISSET

#define __FD_ISSET(fd,fdsetp) test_bit(fd, (void *)(fdsetp))



#undef	__FD_ZERO

#define __FD_ZERO(fdsetp) memset((void *)(fdsetp), 0, __FDSET_LONGS << 2)



#endif /* __KERNEL__ */

#define __kernel_old_dev_t __kernel_old_dev_t



#endif /* __ARCH_CRIS_POSIX_TYPES_H */