Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edfa5cfa authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86: types: use <asm-generic/int-*.h> for the x86 architecture 



This modifies <asm-x86/types.h> to use the <asm-generic/int-*.h>
generic include files.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
parent a192da9a

include/asm-x86/types.h

+2 −36
Original line number Diff line number Diff line 
#ifndef _ASM_X86_TYPES_H

#define _ASM_X86_TYPES_H



#include <asm-generic/int-ll64.h>



#ifndef __ASSEMBLY__



typedef unsigned short umode_t;



/*

 * __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 __i386__

# ifdef __GNUC__

__extension__ typedef __signed__ long long __s64;

__extension__ typedef unsigned long long __u64;

# endif

#else

typedef __signed__ long long __s64;

typedef unsigned long long __u64;

#endif



#endif /* __ASSEMBLY__ */



/*
@@ -44,18 +22,6 @@ typedef unsigned long long __u64; 


#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;



typedef signed long long s64;

typedef unsigned long long u64;



typedef u64 dma64_addr_t;

#if defined(CONFIG_X86_64) || defined(CONFIG_HIGHMEM64G)

/* DMA addresses come in 32-bit and 64-bit flavours. */