lkml.org 
[lkml]   [2008]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/24] powerpc: types: use <asm-generic/int-*.h> for the powerpc architecture
    Date
    This modifies <asm-powerpc/types.h> to use the <asm-generic/int-*.h>
    generic include files.

    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Anton Blanchard <anton@samba.org>
    ---
    include/asm-powerpc/types.h | 48 +++++-------------------------------------
    1 files changed, 6 insertions(+), 42 deletions(-)

    diff --git a/include/asm-powerpc/types.h b/include/asm-powerpc/types.h
    index c243a6a..d3374bc 100644
    --- a/include/asm-powerpc/types.h
    +++ b/include/asm-powerpc/types.h
    @@ -1,6 +1,12 @@
    #ifndef _ASM_POWERPC_TYPES_H
    #define _ASM_POWERPC_TYPES_H

    +#ifdef __powerpc64__
    +# include <asm-generic/int-l64.h>
    +#else
    +# include <asm-generic/int-ll64.h>
    +#endif
    +
    #ifndef __ASSEMBLY__

    /*
    @@ -22,30 +28,6 @@ typedef unsigned int umode_t;
    typedef unsigned short umode_t;
    #endif

    -/*
    - * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
    - * header files exported to user space
    - */
    -
    -typedef __signed__ char __s8;
    -typedef unsigned char __u8;
    -
    -typedef __signed__ short __s16;
    -typedef unsigned short __u16;
    -
    -typedef __signed__ int __s32;
    -typedef unsigned int __u32;
    -
    -#ifdef __powerpc64__
    -typedef __signed__ long __s64;
    -typedef unsigned long __u64;
    -#else
    -#if defined(__GNUC__)
    -__extension__ typedef __signed__ long long __s64;
    -__extension__ typedef unsigned long long __u64;
    -#endif
    -#endif /* __powerpc64__ */
    -
    typedef struct {
    __u32 u[4];
    } __attribute__((aligned(16))) __vector128;
    @@ -64,24 +46,6 @@ typedef struct {

    #ifndef __ASSEMBLY__

    -
    -typedef signed char s8;
    -typedef unsigned char u8;
    -
    -typedef signed short s16;
    -typedef unsigned short u16;
    -
    -typedef signed int s32;
    -typedef unsigned int u32;
    -
    -#ifdef __powerpc64__
    -typedef signed long s64;
    -typedef unsigned long u64;
    -#else
    -typedef signed long long s64;
    -typedef unsigned long long u64;
    -#endif
    -
    typedef __vector128 vector128;

    /* Physical address used by some IO functions */
    --
    1.5.4.1


    \
     
     \ /
      Last update: 2008-04-25 01:19    [W:0.023 / U:61.028 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site