From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd-r2nGTMty4D4@public.gmane.org Subject: [RFC 09/17] asm-generic: provide a common types.h Date: Mon, 27 Apr 2009 17:01:23 +0200 Message-ID: <20090427150318.706763353@arndb.de> References: <20090427142010.587518220@arndb.de> Return-path: Content-Disposition: inline; filename=0005-asm-generic-provide-a-common-types.h.patch Sender: linux-api-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: john.williams-g5w7nrANp4BDPfheJLI6IQ@public.gmane.org, monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org, linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, liqin.chen-+XGAvkf1AAHby3iVrkZq2A@public.gmane.org, Sam Ravnborg , Remis Lima Baima List-Id: linux-arch.vger.kernel.org Practically all 32 bit architectures can use the same definitions in asm/types.h, so make that the default. Signed-off-by: Arnd Bergmann Signed-off-by: Remis Lima Baima --- include/asm-generic/Kbuild | 1 1 + 0 - 0 ! include/asm-generic/types.h | 42 42 + 0 - 0 ! 2 files changed, 43 insertions(+) create mode 100644 include/asm-generic/types.h Index: linux-2.6/include/asm-generic/Kbuild =================================================================== --- linux-2.6.orig/include/asm-generic/Kbuild +++ linux-2.6/include/asm-generic/Kbuild @@ -14,6 +14,7 @@ header-y += signal-defs.h header-y += signal.h header-y += statfs.h header-y += termios.h +header-y += types.h unifdef-y += int-l64.h unifdef-y += int-ll64.h Index: linux-2.6/include/asm-generic/types.h =================================================================== --- /dev/null +++ linux-2.6/include/asm-generic/types.h @@ -0,0 +1,42 @@ +#ifndef _ASM_GENERIC_TYPES_H +#define _ASM_GENERIC_TYPES_H +/* + * int-ll64 is used practically everywhere now, + * so use it as a reasonable default. + */ +#include + +#ifndef __ASSEMBLY__ + +typedef unsigned short umode_t; + +#endif /* __ASSEMBLY__ */ + +/* + * These aren't exported outside the kernel to avoid name space clashes + */ +#ifdef __KERNEL__ +#ifndef __ASSEMBLY__ +/* + * DMA addresses may be very different from physical addresses + * and pointers. i386 and powerpc may have 64 bit DMA on 32 bit + * systems, while sparc64 uses 32 bit DMA addresses for 64 bit + * physical addresses. + * This default defines dma_addr_t to have the same size as + * phys_addr_t, which is the most common way. + * Do not define the dma64_addr_t type, which never really + * worked. + */ +#ifndef dma_addr_t +#ifdef CONFIG_PHYS_ADDR_T_64BIT +typedef u64 dma_addr_t; +#else +typedef u32 dma_addr_t; +#endif /* CONFIG_PHYS_ADDR_T_64BIT */ +#endif /* dma_addr_t */ + +#endif /* __ASSEMBLY__ */ + +#endif /* __KERNEL__ */ + +#endif /* _ASM_GENERIC_TYPES_H */ -- -- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from moutng.kundenserver.de ([212.227.126.187]:63956 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756108AbZD0PHg (ORCPT ); Mon, 27 Apr 2009 11:07:36 -0400 Message-ID: <20090427150318.706763353@arndb.de> References: <20090427142010.587518220@arndb.de> Date: Mon, 27 Apr 2009 17:01:23 +0200 From: arnd@arndb.de Subject: [RFC 09/17] asm-generic: provide a common types.h Content-Disposition: inline; filename=0005-asm-generic-provide-a-common-types.h.patch Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-kernel@vger.kernel.org Cc: john.williams@petalogix.com, monstr@monstr.eu, linux-api@vger.kernel.org, linux-arch@vger.kernel.org, liqin.chen@sunplusct.com, Sam Ravnborg , Remis Lima Baima Message-ID: <20090427150123.qbdl-ByHC_EqONHWyZWTM4Y5yJ8v_v4InfyWTCAWf7Q@z> Practically all 32 bit architectures can use the same definitions in asm/types.h, so make that the default. Signed-off-by: Arnd Bergmann Signed-off-by: Remis Lima Baima --- include/asm-generic/Kbuild | 1 1 + 0 - 0 ! include/asm-generic/types.h | 42 42 + 0 - 0 ! 2 files changed, 43 insertions(+) create mode 100644 include/asm-generic/types.h Index: linux-2.6/include/asm-generic/Kbuild =================================================================== --- linux-2.6.orig/include/asm-generic/Kbuild +++ linux-2.6/include/asm-generic/Kbuild @@ -14,6 +14,7 @@ header-y += signal-defs.h header-y += signal.h header-y += statfs.h header-y += termios.h +header-y += types.h unifdef-y += int-l64.h unifdef-y += int-ll64.h Index: linux-2.6/include/asm-generic/types.h =================================================================== --- /dev/null +++ linux-2.6/include/asm-generic/types.h @@ -0,0 +1,42 @@ +#ifndef _ASM_GENERIC_TYPES_H +#define _ASM_GENERIC_TYPES_H +/* + * int-ll64 is used practically everywhere now, + * so use it as a reasonable default. + */ +#include + +#ifndef __ASSEMBLY__ + +typedef unsigned short umode_t; + +#endif /* __ASSEMBLY__ */ + +/* + * These aren't exported outside the kernel to avoid name space clashes + */ +#ifdef __KERNEL__ +#ifndef __ASSEMBLY__ +/* + * DMA addresses may be very different from physical addresses + * and pointers. i386 and powerpc may have 64 bit DMA on 32 bit + * systems, while sparc64 uses 32 bit DMA addresses for 64 bit + * physical addresses. + * This default defines dma_addr_t to have the same size as + * phys_addr_t, which is the most common way. + * Do not define the dma64_addr_t type, which never really + * worked. + */ +#ifndef dma_addr_t +#ifdef CONFIG_PHYS_ADDR_T_64BIT +typedef u64 dma_addr_t; +#else +typedef u32 dma_addr_t; +#endif /* CONFIG_PHYS_ADDR_T_64BIT */ +#endif /* dma_addr_t */ + +#endif /* __ASSEMBLY__ */ + +#endif /* __KERNEL__ */ + +#endif /* _ASM_GENERIC_TYPES_H */ --