powerpc: types: use <asm-generic/int-*.h> for the powerpc architecture
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>
This commit is contained in:
Родитель
849bf3a09f
Коммит
3f02c4e0e5
|
@ -1,6 +1,12 @@
|
||||||
#ifndef _ASM_POWERPC_TYPES_H
|
#ifndef _ASM_POWERPC_TYPES_H
|
||||||
#define _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__
|
#ifndef __ASSEMBLY__
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -22,30 +28,6 @@ typedef unsigned int umode_t;
|
||||||
typedef unsigned short umode_t;
|
typedef unsigned short umode_t;
|
||||||
#endif
|
#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 {
|
typedef struct {
|
||||||
__u32 u[4];
|
__u32 u[4];
|
||||||
} __attribute__((aligned(16))) __vector128;
|
} __attribute__((aligned(16))) __vector128;
|
||||||
|
@ -64,24 +46,6 @@ typedef struct {
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
#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;
|
typedef __vector128 vector128;
|
||||||
|
|
||||||
/* Physical address used by some IO functions */
|
/* Physical address used by some IO functions */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче