From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753590AbaIKJVl (ORCPT ); Thu, 11 Sep 2014 05:21:41 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:15020 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752216AbaIKJVi (ORCPT ); Thu, 11 Sep 2014 05:21:38 -0400 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 CC: "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Catalin Marinas , Yang Yingliang 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> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.18.231] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 */