From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758192AbYDXXPn (ORCPT ); Thu, 24 Apr 2008 19:15:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755655AbYDXXHh (ORCPT ); Thu, 24 Apr 2008 19:07:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36688 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753075AbYDXXHI (ORCPT ); Thu, 24 Apr 2008 19:07:08 -0400 From: "H. Peter Anvin" To: Linus Torvalds , Andrew Morton Cc: Linux Kernel Mailing List , Linux Arch Mailing List , "H. Peter Anvin" , Paul Mackerras , Anton Blanchard Subject: [PATCH 15/24] powerpc: types: use for the powerpc architecture Date: Thu, 24 Apr 2008 16:05:36 -0700 Message-Id: <1209078352-7593-30-git-send-email-hpa@zytor.com> X-Mailer: git-send-email 1.5.4.1 In-Reply-To: <1209078352-7593-29-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> 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: Paul Mackerras Cc: Anton Blanchard --- include/asm-powerpc/types.h | 48 +++++------------------------------------- 1 files changed, 6 insertions(+), 42 deletions(-) diff --git a/include/asm-powerpc/types.h b/include/asm-powerpc/types.h index c243a6a..d3374bc 100644 --- a/include/asm-powerpc/types.h +++ b/include/asm-powerpc/types.h @@ -1,6 +1,12 @@ #ifndef _ASM_POWERPC_TYPES_H #define _ASM_POWERPC_TYPES_H +#ifdef __powerpc64__ +# include +#else +# include +#endif + #ifndef __ASSEMBLY__ /* @@ -22,30 +28,6 @@ typedef unsigned int umode_t; typedef unsigned short umode_t; #endif -/* - * __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 __powerpc64__ -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 /* __powerpc64__ */ - typedef struct { __u32 u[4]; } __attribute__((aligned(16))) __vector128; @@ -64,24 +46,6 @@ typedef struct { #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; - -#ifdef __powerpc64__ -typedef signed long s64; -typedef unsigned long u64; -#else -typedef signed long long s64; -typedef unsigned long long u64; -#endif - typedef __vector128 vector128; /* Physical address used by some IO functions */ -- 1.5.4.1