From patchwork Thu Sep 11 09:21:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 4884161 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4CA849F32E for ; Thu, 11 Sep 2014 09:24:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2BD6320254 for ; Thu, 11 Sep 2014 09:24:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E9158200FF for ; Thu, 11 Sep 2014 09:24:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XS0aE-0000dR-Vq; Thu, 11 Sep 2014 09:22:30 +0000 Received: from szxga02-in.huawei.com ([119.145.14.65]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XS0aB-0000HI-Vv for linux-arm-kernel@lists.infradead.org; Thu, 11 Sep 2014 09:22:29 +0000 Received: from 172.24.2.119 (EHLO szxeml459-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BZH95672; Thu, 11 Sep 2014 17:21:26 +0800 (CST) Received: from [127.0.0.1] (10.177.18.231) by szxeml459-hub.china.huawei.com (10.82.67.202) with Microsoft SMTP Server id 14.3.158.1; Thu, 11 Sep 2014 17:21:20 +0800 Message-ID: <5411698E.3000402@huawei.com> Date: Thu, 11 Sep 2014 17:21:18 +0800 From: Yang Yingliang User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 MIME-Version: 1.0 To: Will Deacon Subject: [PATCH v2] arm64: add guard macros of unistd.h to prevent double inclusion References: <1410235185-16652-1-git-send-email-yangyingliang@huawei.com> <20140909123938.GL1754@arm.com> <54115583.8080306@huawei.com> In-Reply-To: <54115583.8080306@huawei.com> X-Originating-IP: [10.177.18.231] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140911_022228_854568_C05C2DB9 X-CRM114-Status: UNSURE ( 6.82 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -3.2 (---) Cc: Catalin Marinas , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Yang Yingliang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Yang Yingliang Add guard macros for uapi/asm/unistd.h, asm/unistd.h and asm/unistd32.h. Signed-off-by: Yang Yingliang --- arch/arm64/include/asm/unistd.h | 5 +++++ arch/arm64/include/asm/unistd32.h | 4 ++++ arch/arm64/include/uapi/asm/unistd.h | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index 6d2bf41..21a7dec 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -13,6 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +#ifndef __ASM_ARM64_UNISTD_H +#define __ASM_ARM64_UNISTD_H + #ifdef CONFIG_COMPAT #define __ARCH_WANT_COMPAT_SYS_GETDENTS64 #define __ARCH_WANT_COMPAT_STAT64 @@ -48,3 +51,5 @@ #include #define NR_syscalls (__NR_syscalls) + +#endif /* __ASM_ARM64_UNISTD_H */ diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h index da1f06b..8f5e78e 100644 --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h @@ -16,6 +16,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +#ifndef __ASM_ARM64_UNISTD32_H +#define __ASM_ARM64_UNISTD32_H #ifndef __SYSCALL #define __SYSCALL(x, y) @@ -792,3 +794,5 @@ __SYSCALL(__NR_renameat2, sys_renameat2) __SYSCALL(__NR_getrandom, sys_getrandom) #define __NR_memfd_create 385 __SYSCALL(__NR_memfd_create, sys_memfd_create) + +#endif /* __ASM_ARM64_UNISTD32_H */ diff --git a/arch/arm64/include/uapi/asm/unistd.h b/arch/arm64/include/uapi/asm/unistd.h index 1caadc2..ab72cac 100644 --- a/arch/arm64/include/uapi/asm/unistd.h +++ b/arch/arm64/include/uapi/asm/unistd.h @@ -13,4 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +#ifndef _UAPI__ASM_ARM64_UNISTD_H +#define _UAPI__ASM_ARM64_UNISTD_H + #include + +#endif /* _UAPI__ASM_ARM64_UNISTD_H */