From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757208AbYDXXRz (ORCPT ); Thu, 24 Apr 2008 19:17:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755832AbYDXXHx (ORCPT ); Thu, 24 Apr 2008 19:07:53 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36698 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752631AbYDXXHQ (ORCPT ); Thu, 24 Apr 2008 19:07:16 -0400 From: "H. Peter Anvin" To: Linus Torvalds , Andrew Morton Cc: Linux Kernel Mailing List , Linux Arch Mailing List , "H. Peter Anvin" , Ralf Baechle Subject: [PATCH 12/24] mips: types: use for the mips architecture Date: Thu, 24 Apr 2008 16:05:30 -0700 Message-Id: <1209078352-7593-24-git-send-email-hpa@zytor.com> X-Mailer: git-send-email 1.5.4.1 In-Reply-To: <1209078352-7593-23-git-send-email-hpa@zytor.com> References: <1209078352-7593-1-git-send-email-hpa@zytor.com> <1209078352-7593-2-git-send-email-hpa@zytor.com> <1209078352-7593-3-git-send-email-hpa@zytor.com> <1209078352-7593-4-git-send-email-hpa@zytor.com> <1209078352-7593-5-git-send-email-hpa@zytor.com> <1209078352-7593-6-git-send-email-hpa@zytor.com> <1209078352-7593-7-git-send-email-hpa@zytor.com> <1209078352-7593-8-git-send-email-hpa@zytor.com> <1209078352-7593-9-git-send-email-hpa@zytor.com> <1209078352-7593-10-git-send-email-hpa@zytor.com> <1209078352-7593-11-git-send-email-hpa@zytor.com> <1209078352-7593-12-git-send-email-hpa@zytor.com> <1209078352-7593-13-git-send-email-hpa@zytor.com> <1209078352-7593-14-git-send-email-hpa@zytor.com> <1209078352-7593-15-git-send-email-hpa@zytor.com> <1209078352-7593-16-git-send-email-hpa@zytor.com> <1209078352-7593-17-git-send-email-hpa@zytor.com> <1209078352-7593-18-git-send-email-hpa@zytor.com> <1209078352-7593-19-git-send-email-hpa@zytor.com> <1209078352-7593-20-git-send-email-hpa@zytor.com> <1209078352-7593-21-git-send-email-hpa@zytor.com> <1209078352-7593-22-git-send-email-hpa@zytor.com> <1209078352-7593-23-git-send-email-hpa@zytor.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Ralf Baechle --- include/asm-mips/types.h | 56 +++++----------------------------------------- 1 files changed, 6 insertions(+), 50 deletions(-) diff --git a/include/asm-mips/types.h b/include/asm-mips/types.h index 2dd147f..7a2ee4f 100644 --- a/include/asm-mips/types.h +++ b/include/asm-mips/types.h @@ -9,36 +9,16 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H +#if _MIPS_SZLONG == 64 +# include +#else +# include +#endif + #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 (_MIPS_SZLONG == 64) - -typedef __signed__ long __s64; -typedef unsigned long __u64; - -#else - -#if defined(__GNUC__) -__extension__ typedef __signed__ long long __s64; -__extension__ typedef unsigned long long __u64; -#endif - #endif #endif /* __ASSEMBLY__ */ @@ -52,30 +32,6 @@ __extension__ 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; - -#if (_MIPS_SZLONG == 64) - -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 - #if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \ || defined(CONFIG_64BIT) typedef u64 dma_addr_t; -- 1.5.4.1