From patchwork Mon Nov 25 08:55:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 3228441 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9C74EC045B for ; Mon, 25 Nov 2013 08:57:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C80C8200FF for ; Mon, 25 Nov 2013 08:57:00 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3833B201B9 for ; Mon, 25 Nov 2013 08:56:55 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VkryJ-0008CA-Iw; Mon, 25 Nov 2013 08:56:47 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VkryG-0007m5-Uq; Mon, 25 Nov 2013 08:56:44 +0000 Received: from winston.telenet-ops.be ([195.130.137.75]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VkryD-0007jq-5b for linux-arm-kernel@lists.infradead.org; Mon, 25 Nov 2013 08:56:42 +0000 Received: from georges.telenet-ops.be (georges.telenet-ops.be [195.130.137.68]) by winston.telenet-ops.be (Postfix) with ESMTP id 6B61A5A8090 for ; Mon, 25 Nov 2013 09:56:14 +0100 (CET) Received: from ayla.of.borg ([84.193.72.141]) by georges.telenet-ops.be with bizsmtp id tkvl1m00532ts5g06kvl2T; Mon, 25 Nov 2013 09:55:48 +0100 Received: from geert by ayla.of.borg with local (Exim 4.76) (envelope-from ) id 1VkrxI-0006W5-Sj; Mon, 25 Nov 2013 09:55:44 +0100 From: Geert Uytterhoeven To: Arnd Bergmann , linux-arch@vger.kernel.org Subject: [PATCH 24/24] asm-generic: Rename int-ll64.h to types.h Date: Mon, 25 Nov 2013 09:55:34 +0100 Message-Id: <1385369734-24893-25-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1385369734-24893-1-git-send-email-geert@linux-m68k.org> References: <1385369734-24893-1-git-send-email-geert@linux-m68k.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131125_035641_429840_1DB124E7 X-CRM114-Status: GOOD ( 11.57 ) X-Spam-Score: 0.6 (/) Cc: linux-mips@linux-mips.org, linux-ia64@vger.kernel.org, linux-s390@vger.kernel.org, linux-xtensa@linux-xtensa.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, Geert Uytterhoeven , linux-alpha@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, SUSPICIOUS_RECIPS, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since kernelspace always uses "(unsigned) long long" for 64-bit integer values ("u64" and "s64"), rename include/asm-generic/int-ll64.h to include/asm-generic/types.h, as suggested by Arnd Bergmann. Userspace still has both include/uapi/asm-generic/int-l64.h and include/uapi/asm-generic/int-ll64.h, as int-l64.h may still be used for userspace on existing 64-bit platforms (alpha, ia64, mips, and powerpc). Note: While arch/alpha/include/asm/types.h just includes asm-generic/types.h, don't be tempted to use Kbuild logic to provide it! arch/*/include/asm/Kbuild applies to both arch/*/include/asm and arch/*/include/uapi/asm, while alpha has its own . Signed-off-by: Geert Uytterhoeven Cc: linux-alpha@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-ia64@vger.kernel.org Cc: linux-mips@linux-mips.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-s390@vger.kernel.org Cc: linux-sh@vger.kernel.org Cc: linux-xtensa@linux-xtensa.org Cc: linux-kbuild@vger.kernel.org --- Question: Is the arch/*/include/asm/Kbuild behavior intentional? arch/alpha/include/asm/types.h | 2 +- arch/arm/include/asm/types.h | 2 +- arch/ia64/include/asm/types.h | 2 +- arch/mips/include/asm/types.h | 2 +- arch/powerpc/include/asm/types.h | 2 +- arch/s390/include/asm/types.h | 2 +- arch/sh/include/asm/types.h | 2 +- arch/xtensa/include/asm/types.h | 2 +- include/asm-generic/io-64-nonatomic-hi-lo.h | 2 +- include/asm-generic/io-64-nonatomic-lo-hi.h | 2 +- include/asm-generic/{int-ll64.h => types.h} | 8 ++++---- 11 files changed, 14 insertions(+), 14 deletions(-) rename include/asm-generic/{int-ll64.h => types.h} (85%) diff --git a/arch/alpha/include/asm/types.h b/arch/alpha/include/asm/types.h index 4cb4b6d3452c..b86fb65c5b10 100644 --- a/arch/alpha/include/asm/types.h +++ b/arch/alpha/include/asm/types.h @@ -1,6 +1,6 @@ #ifndef _ALPHA_TYPES_H #define _ALPHA_TYPES_H -#include +#include #endif /* _ALPHA_TYPES_H */ diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index a53cdb8f068c..09e15a8a40b1 100644 --- a/arch/arm/include/asm/types.h +++ b/arch/arm/include/asm/types.h @@ -1,7 +1,7 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H -#include +#include /* * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as diff --git a/arch/ia64/include/asm/types.h b/arch/ia64/include/asm/types.h index 4c351b169da2..6bc2e8acadd7 100644 --- a/arch/ia64/include/asm/types.h +++ b/arch/ia64/include/asm/types.h @@ -13,7 +13,7 @@ #ifndef _ASM_IA64_TYPES_H #define _ASM_IA64_TYPES_H -#include +#include #include #ifdef __ASSEMBLY__ diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h index 4d5ce4c9c924..0d6729329a6a 100644 --- a/arch/mips/include/asm/types.h +++ b/arch/mips/include/asm/types.h @@ -11,7 +11,7 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H -#include +#include /* * These aren't exported outside the kernel to avoid name space clashes diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h index 4b9c3530bb12..69d42a918e0e 100644 --- a/arch/powerpc/include/asm/types.h +++ b/arch/powerpc/include/asm/types.h @@ -13,7 +13,7 @@ #ifndef _ASM_POWERPC_TYPES_H #define _ASM_POWERPC_TYPES_H -#include +#include #include #ifndef __ASSEMBLY__ diff --git a/arch/s390/include/asm/types.h b/arch/s390/include/asm/types.h index a5c7e829dbc3..abb93c7f0125 100644 --- a/arch/s390/include/asm/types.h +++ b/arch/s390/include/asm/types.h @@ -6,7 +6,7 @@ #ifndef _S390_TYPES_H #define _S390_TYPES_H -#include +#include #include /* diff --git a/arch/sh/include/asm/types.h b/arch/sh/include/asm/types.h index 062324be5cd6..ef745dcfd926 100644 --- a/arch/sh/include/asm/types.h +++ b/arch/sh/include/asm/types.h @@ -1,7 +1,7 @@ #ifndef __ASM_SH_TYPES_H #define __ASM_SH_TYPES_H -#include +#include /* * These aren't exported outside the kernel to avoid name space clashes diff --git a/arch/xtensa/include/asm/types.h b/arch/xtensa/include/asm/types.h index d873cb17d944..20ffdf440e4f 100644 --- a/arch/xtensa/include/asm/types.h +++ b/arch/xtensa/include/asm/types.h @@ -10,7 +10,7 @@ #ifndef _XTENSA_TYPES_H #define _XTENSA_TYPES_H -#include +#include #include #endif /* _XTENSA_TYPES_H */ diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h b/include/asm-generic/io-64-nonatomic-hi-lo.h index a6806a94250d..414d2c49d53c 100644 --- a/include/asm-generic/io-64-nonatomic-hi-lo.h +++ b/include/asm-generic/io-64-nonatomic-hi-lo.h @@ -2,7 +2,7 @@ #define _ASM_IO_64_NONATOMIC_HI_LO_H_ #include -#include +#include #ifndef readq static inline __u64 readq(const volatile void __iomem *addr) diff --git a/include/asm-generic/io-64-nonatomic-lo-hi.h b/include/asm-generic/io-64-nonatomic-lo-hi.h index ca546b1ff8b5..9bc5a3393ca1 100644 --- a/include/asm-generic/io-64-nonatomic-lo-hi.h +++ b/include/asm-generic/io-64-nonatomic-lo-hi.h @@ -2,7 +2,7 @@ #define _ASM_IO_64_NONATOMIC_LO_HI_H_ #include -#include +#include #ifndef readq static inline __u64 readq(const volatile void __iomem *addr) diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/types.h similarity index 85% rename from include/asm-generic/int-ll64.h rename to include/asm-generic/types.h index 4cd84855cb46..b9542bb3d991 100644 --- a/include/asm-generic/int-ll64.h +++ b/include/asm-generic/types.h @@ -1,11 +1,11 @@ /* - * asm-generic/int-ll64.h + * asm-generic/types.h * * Integer declarations for architectures which use "long long" * for 64-bit types. */ -#ifndef _ASM_GENERIC_INT_LL64_H -#define _ASM_GENERIC_INT_LL64_H +#ifndef _ASM_GENERIC_TYPES_H +#define _ASM_GENERIC_TYPES_H #include @@ -46,4 +46,4 @@ typedef unsigned long long u64; #endif /* __ASSEMBLY__ */ -#endif /* _ASM_GENERIC_INT_LL64_H */ +#endif /* _ASM_GENERIC_TYPES_H */