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

Commit 9d256ff5 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: unify include/asm/types_32/64.h 



Mostly the same. Make the few exceptions conditional.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>

Conflicts:

	include/asm-x86/types_32.h
parent 01749f6d

include/asm-x86/Kbuild

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ unifdef-y += stat_32.h 
unifdef-y += stat_64.h

unifdef-y += statfs_32.h

unifdef-y += statfs_64.h

unifdef-y += types_32.h

unifdef-y += types_64.h

unifdef-y += unistd_32.h

unifdef-y += unistd_64.h

unifdef-y += user_32.h

include/asm-x86/types.h

+67 −10
Original line number Diff line number Diff line 
#ifndef _ASM_X86_TYPES_H

#define _ASM_X86_TYPES_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__ */



/*

 * These aren't exported outside the kernel to avoid name space clashes

 */

#ifdef __KERNEL__



#ifdef CONFIG_X86_32

#  include "types_32.h"

# define BITS_PER_LONG 32

#else

#  include "types_64.h"

# define BITS_PER_LONG 64

#endif



#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. */

typedef u64 dma_addr_t;

#else

# ifdef __i386__

#  include "types_32.h"

# else

#  include "types_64.h"

typedef u32 dma_addr_t;

#endif



#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */



#endif

include/asm-x86/types_32.h

deleted100644 → 0
+0 −64
Original line number Diff line number Diff line 
#ifndef _I386_TYPES_H

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



#if defined(__GNUC__)

__extension__ typedef __signed__ long long __s64;

__extension__ typedef unsigned long long __u64;

#endif



#endif /* __ASSEMBLY__ */



/*

 * These aren't exported outside the kernel to avoid name space clashes

 */

#ifdef __KERNEL__



#define BITS_PER_LONG 32



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



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



#ifdef CONFIG_HIGHMEM64G

typedef u64 dma_addr_t;

#else

typedef u32 dma_addr_t;

#endif

typedef u64 dma64_addr_t;



#endif /* __ASSEMBLY__ */



#endif /* __KERNEL__ */



#endif

include/asm-x86/types_64.h

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
#ifndef _X86_64_TYPES_H

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



typedef __signed__ long long __s64;

typedef unsigned long long  __u64;



#endif /* __ASSEMBLY__ */



/*

 * These aren't exported outside the kernel to avoid name space clashes

 */

#ifdef __KERNEL__



#define BITS_PER_LONG 64



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



#endif /* __ASSEMBLY__ */



#endif /* __KERNEL__ */



#endif