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] arm: Use generic posix_types.h
    Commit-ID:  e7ca2e1d9bea753dca96e3c693f0608035ea20ed
    Gitweb: http://git.kernel.org/tip/e7ca2e1d9bea753dca96e3c693f0608035ea20ed
    Author: H. Peter Anvin <hpa@zytor.com>
    AuthorDate: Tue, 7 Feb 2012 21:08:48 -0800
    Committer: H. Peter Anvin <hpa@zytor.com>
    CommitDate: Tue, 14 Feb 2012 12:01:28 -0800

    arm: Use generic posix_types.h

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

    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Link: http://lkml.kernel.org/r/1328677745-20121-5-git-send-email-hpa@zytor.com
    ---
    arch/arm/include/asm/posix_types.h | 55 ++++++------------------------------
    1 files changed, 9 insertions(+), 46 deletions(-)

    diff --git a/arch/arm/include/asm/posix_types.h b/arch/arm/include/asm/posix_types.h
    index 2446d23..efdf990 100644
    --- a/arch/arm/include/asm/posix_types.h
    +++ b/arch/arm/include/asm/posix_types.h
    @@ -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

    \
     
     \ /
      Last update: 2012-02-20 22:03    [W:4.088 / U:0.944 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site