lkml.org 
[lkml]   [2012]   [Feb]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:core/types] xtensa: Use generic posix_types.h
    Commit-ID:  2759e6512e0bd9f9a84e10f59fb71195e7ff9775
    Gitweb: http://git.kernel.org/tip/2759e6512e0bd9f9a84e10f59fb71195e7ff9775
    Author: H. Peter Anvin <hpa@zytor.com>
    AuthorDate: Tue, 7 Feb 2012 21:09:04 -0800
    Committer: H. Peter Anvin <hpa@zytor.com>
    CommitDate: Tue, 14 Feb 2012 12:01:30 -0800

    xtensa: Use generic posix_types.h

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

    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Link: http://lkml.kernel.org/r/1328677745-20121-21-git-send-email-hpa@zytor.com
    Cc: Chris Zankel <chris@zankel.net>
    ---
    arch/xtensa/include/asm/posix_types.h | 97 +++------------------------------
    1 files changed, 7 insertions(+), 90 deletions(-)

    diff --git a/arch/xtensa/include/asm/posix_types.h b/arch/xtensa/include/asm/posix_types.h
    index 6b2190c..6e96be0 100644
    --- a/arch/xtensa/include/asm/posix_types.h
    +++ b/arch/xtensa/include/asm/posix_types.h
    @@ -19,104 +19,21 @@
    * assume GCC is being used.
    */

    -typedef unsigned long __kernel_ino_t;
    -typedef unsigned int __kernel_mode_t;
    -typedef unsigned long __kernel_nlink_t;
    -typedef long __kernel_off_t;
    -typedef int __kernel_pid_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 int __kernel_size_t;
    typedef int __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_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;
    -
    -#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)))
    -#define __FD_ZERO(set) \
    - ((void) memset ((void *) (set), 0, sizeof (__kernel_fd_set)))
    -
    -#else /* __GNUC__ */
    +#define __kernel_old_uid_t __kernel_old_uid_t

    -#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 int *tmp = (unsigned int *)p->fds_bits;
    - int i;
    +typedef unsigned short __kernel_old_dev_t;
    +#define __kernel_old_dev_t __kernel_old_dev_t

    - if (__builtin_constant_p(__FDSET_LONGS)) {
    - switch (__FDSET_LONGS) {
    - 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;
    - }
    - }
    - i = __FDSET_LONGS;
    - while (i) {
    - i--;
    - *tmp = 0;
    - tmp++;
    - }
    -}
    +#include <asm-generic/posix_types.h>

    -#endif /* defined(__KERNEL__) */
    -#endif /* __GNUC__ */
    #endif /* _XTENSA_POSIX_TYPES_H */

    \
     
     \ /
      Last update: 2012-02-20 22:15    [W:0.028 / U:58.772 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site