From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757584AbYDXXLe (ORCPT ); Thu, 24 Apr 2008 19:11:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753219AbYDXXHE (ORCPT ); Thu, 24 Apr 2008 19:07:04 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36637 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754800AbYDXXGj (ORCPT ); Thu, 24 Apr 2008 19:06:39 -0400 From: "H. Peter Anvin" To: Linus Torvalds , Andrew Morton Cc: Linux Kernel Mailing List , Linux Arch Mailing List , "H. Peter Anvin" Subject: [PATCH 16/24] s390: types: use for the s390 architecture Date: Thu, 24 Apr 2008 16:05:39 -0700 Message-Id: <1209078352-7593-33-git-send-email-hpa@zytor.com> X-Mailer: git-send-email 1.5.4.1 In-Reply-To: <1209078352-7593-32-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> <1209078352-7593-24-git-send-email-hpa@zytor.com> <1209078352-7593-25-git-send-email-hpa@zytor.com> <1209078352-7593-26-git-send-email-hpa@zytor.com> <1209078352-7593-27-git-send-email-hpa@zytor.com> <1209078352-7593-28-git-send-email-hpa@zytor.com> <1209078352-7593-29-git-send-email-hpa@zytor.com> <1209078352-7593-30-git-send-email-hpa@zytor.com> <1209078352-7593-31-git-send-email-hpa@zytor.com> <1209078352-7593-32-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 --- include/asm-s390/types.h | 48 +++++---------------------------------------- 1 files changed, 6 insertions(+), 42 deletions(-) diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h index 2c5879a..78dda03 100644 --- a/include/asm-s390/types.h +++ b/include/asm-s390/types.h @@ -9,34 +9,16 @@ #ifndef _S390_TYPES_H #define _S390_TYPES_H +#ifndef __s390x__ +# 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; - -#ifndef __s390x__ -#if defined(__GNUC__) -__extension__ typedef __signed__ long long __s64; -__extension__ typedef unsigned long long __u64; -#endif -#else /* __s390x__ */ -typedef __signed__ long __s64; -typedef unsigned long __u64; -#endif - /* A address type so that arithmetic can be done on it & it can be upgraded to 64 bit when necessary */ @@ -58,24 +40,6 @@ typedef __signed__ long saddr_t; #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; - -#ifndef __s390x__ -typedef signed long long s64; -typedef unsigned long long u64; -#else /* __s390x__ */ -typedef signed long s64; -typedef unsigned long u64; -#endif /* __s390x__ */ - typedef u32 dma_addr_t; #ifndef __s390x__ -- 1.5.4.1