[PATCH] powerpc: Merge types.h
This patch merges types.h into include/asm-powerpc. The only real change is the removal of the include of linux/config.h from the 32-bit version - it doesn't appear to be necessary. This patch has been built on several different 32 and 64-bit platforms, and booted on mpc8540_ads. Signed-off-by: Becky Bruce <becky.bruce@freescale.com> Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
f7f6f4fea6
commit
971dc77b64
2 changed files with 28 additions and 72 deletions
|
@ -1,5 +1,5 @@
|
|||
#ifndef _PPC64_TYPES_H
|
||||
#define _PPC64_TYPES_H
|
||||
#ifndef _ASM_POWERPC_TYPES_H
|
||||
#define _ASM_POWERPC_TYPES_H
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
|
@ -16,7 +16,11 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#ifdef __powerpc64__
|
||||
typedef unsigned int umode_t;
|
||||
#else
|
||||
typedef unsigned short umode_t;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
|
||||
|
@ -32,8 +36,15 @@ 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__) && !defined(__STRICT_ANSI__)
|
||||
typedef __signed__ long long __s64;
|
||||
typedef unsigned long long __u64;
|
||||
#endif
|
||||
#endif /* __powerpc64__ */
|
||||
|
||||
typedef struct {
|
||||
__u32 u[4];
|
||||
|
@ -45,7 +56,11 @@ typedef struct {
|
|||
/*
|
||||
* These aren't exported outside the kernel to avoid name space clashes
|
||||
*/
|
||||
#ifdef __powerpc64__
|
||||
#define BITS_PER_LONG 64
|
||||
#else
|
||||
#define BITS_PER_LONG 32
|
||||
#endif
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
|
@ -58,8 +73,13 @@ 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;
|
||||
|
||||
|
@ -72,8 +92,13 @@ typedef struct {
|
|||
unsigned long env;
|
||||
} func_descr_t;
|
||||
|
||||
#ifdef CONFIG_LBD
|
||||
typedef u64 sector_t;
|
||||
#define HAVE_SECTOR_T
|
||||
#endif
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* _PPC64_TYPES_H */
|
||||
#endif /* _ASM_POWERPC_TYPES_H */
|
|
@ -1,69 +0,0 @@
|
|||
#ifndef _PPC_TYPES_H
|
||||
#define _PPC_TYPES_H
|
||||
|
||||
#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;
|
||||
|
||||
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
||||
typedef __signed__ long long __s64;
|
||||
typedef unsigned long long __u64;
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
__u32 u[4];
|
||||
} __vector128;
|
||||
|
||||
/*
|
||||
* XXX allowed outside of __KERNEL__ for now, until glibc gets
|
||||
* a proper set of asm headers of its own. -- paulus
|
||||
*/
|
||||
typedef unsigned short umode_t;
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#ifdef __KERNEL__
|
||||
/*
|
||||
* These aren't exported outside the kernel to avoid name space clashes
|
||||
*/
|
||||
#define BITS_PER_LONG 32
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
typedef signed char s8;
|
||||
typedef unsigned char u8;
|
||||
|
||||
typedef signed short s16;
|
||||
typedef unsigned short u16;
|
||||
|
||||
typedef signed int s32;
|
||||
typedef unsigned int u32;
|
||||
|
||||
typedef signed long long s64;
|
||||
typedef unsigned long long u64;
|
||||
|
||||
typedef __vector128 vector128;
|
||||
|
||||
/* DMA addresses are 32-bits wide */
|
||||
typedef u32 dma_addr_t;
|
||||
typedef u64 dma64_addr_t;
|
||||
|
||||
#ifdef CONFIG_LBD
|
||||
typedef u64 sector_t;
|
||||
#define HAVE_SECTOR_T
|
||||
#endif
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif
|
Reference in a new issue