Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Ralf Baechle <ralf@linux-mips.org>

+6 -50
+6 -50
include/asm-mips/types.h
··· 9 9 #ifndef _ASM_TYPES_H 10 10 #define _ASM_TYPES_H 11 11 12 + #if _MIPS_SZLONG == 64 13 + # include <asm-generic/int-l64.h> 14 + #else 15 + # include <asm-generic/int-ll64.h> 16 + #endif 17 + 12 18 #ifndef __ASSEMBLY__ 13 19 14 20 typedef unsigned short umode_t; 15 - 16 - /* 17 - * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the 18 - * header files exported to user space 19 - */ 20 - 21 - typedef __signed__ char __s8; 22 - typedef unsigned char __u8; 23 - 24 - typedef __signed__ short __s16; 25 - typedef unsigned short __u16; 26 - 27 - typedef __signed__ int __s32; 28 - typedef unsigned int __u32; 29 - 30 - #if (_MIPS_SZLONG == 64) 31 - 32 - typedef __signed__ long __s64; 33 - typedef unsigned long __u64; 34 - 35 - #else 36 - 37 - #if defined(__GNUC__) 38 - __extension__ typedef __signed__ long long __s64; 39 - __extension__ typedef unsigned long long __u64; 40 - #endif 41 21 42 22 #endif 43 23 ··· 31 51 #define BITS_PER_LONG _MIPS_SZLONG 32 52 33 53 #ifndef __ASSEMBLY__ 34 - 35 - 36 - typedef __signed char s8; 37 - typedef unsigned char u8; 38 - 39 - typedef __signed short s16; 40 - typedef unsigned short u16; 41 - 42 - typedef __signed int s32; 43 - typedef unsigned int u32; 44 - 45 - #if (_MIPS_SZLONG == 64) 46 - 47 - typedef __signed__ long s64; 48 - typedef unsigned long u64; 49 - 50 - #else 51 - 52 - #if defined(__GNUC__) && !defined(__STRICT_ANSI__) 53 - typedef __signed__ long long s64; 54 - typedef unsigned long long u64; 55 - #endif 56 - 57 - #endif 58 54 59 55 #if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \ 60 56 || defined(CONFIG_64BIT)