nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

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

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

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
H. Peter Anvin 2008-04-06 10:35:14 -07:00
parent a192da9afa
commit edfa5cfa3d
1 changed files with 2 additions and 36 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

38
include/asm-x86/types.h
View file

@ -1,34 +1,12 @@
#ifndef _ASM_X86_TYPES_H #ifndef _ASM_X86_TYPES_H
#define _ASM_X86_TYPES_H #define _ASM_X86_TYPES_H
#include <asm-generic/int-ll64.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
typedef unsigned short umode_t; 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__ */ #endif /* __ASSEMBLY__ */
/* /*
@ -44,18 +22,6 @@ typedef unsigned long long __u64;
#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;
typedef signed long long s64;
typedef unsigned long long u64;
typedef u64 dma64_addr_t; typedef u64 dma64_addr_t;
#if defined(CONFIG_X86_64) || defined(CONFIG_HIGHMEM64G) #if defined(CONFIG_X86_64) || defined(CONFIG_HIGHMEM64G)
/* DMA addresses come in 32-bit and 64-bit flavours. */ /* DMA addresses come in 32-bit and 64-bit flavours. */