From patchwork Thu Feb 22 12:15:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10235455 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 75471602DC for ; Thu, 22 Feb 2018 12:16:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F6D028C00 for ; Thu, 22 Feb 2018 12:16:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6464E28C05; Thu, 22 Feb 2018 12:16:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8893028C00 for ; Thu, 22 Feb 2018 12:16:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=OWwhXoNz1XXQIZYE9huzNUQcizBVUYdqEpph+3N3u0M=; b=jxWiHKplY6cC4GsukbxUvCrfj3 2+MuKFVW+FAD3TFoJXXG87rjjUzH34YYlv/P1v9QU/PIQGgTa8HBc2XNZVwlDer2sHxjMAoF/AUXa VC3x0HSWJylgCtvRcGwy9RV3GSASS4XeoRY6hUyx/G0+yxQWF6WQEeHh3X/03Hq3+bwHqoBAO1Fy/ 9iDLUhNj/z4OK0oAQlZytrt/vNpuqlop0qeBRXc8WY/pPGYbH4LzvArh0NshCO/VXS7F/YXUvXINr 50koNj8AsI/WtKMmfGfcu6zOXA1KmTAWlVfXZsUkSnFQd+uW/00aPuDnO5z/Evc0a/JB7igipFXJR TC1AvUHQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eopnc-0002XF-Tz; Thu, 22 Feb 2018 12:16:32 +0000 Received: from conuserg-10.nifty.com ([210.131.2.77]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eopnW-0002U2-CC for linux-arm-kernel@lists.infradead.org; Thu, 22 Feb 2018 12:16:28 +0000 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w1MCFdUE020774; Thu, 22 Feb 2018 21:15:43 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w1MCFdUE020774 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519301743; bh=45+u74fNHpnaXHWviwnehs+VE9r2iGHGrrC9K1HchMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tYBBiVCUWcsq0gMsV+aXZjPjg6m1L3GfkJnwc9m5KhjYNdE8hasez4gUQXSCpH4+y egcrG1UFGqnh1H5/u+mXMPeBkZ8J0nH4KfNfFFJML8MQPmpIkX9a3QelHVn45cIVd0 4orO5cG3cPulqrlCxi8o1cwWrI7HPPH/rSwk6uLmetTwDNgzQypyGLdj3nUK0jCcbI ssdyVp6RcBFE7Hgk7pSTbwkMI3zafTP0CxtFWgINM+BDz2nnpM5G/2VMMvrohMAjPa 1LmSKTkxtwbXSAvd/NjzNiIOOvd6JJJ4d4dud/ItzP/9QO6CySAfeVLwrqnADuA2FH 0H9rhEgBNxqww== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Andrew Morton Subject: [PATCH v3 1/5] linux/const.h: prefix include guard of uapi/linux/const.h with _UAPI Date: Thu, 22 Feb 2018 21:15:11 +0900 Message-Id: <1519301715-31798-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519301715-31798-1-git-send-email-yamada.masahiro@socionext.com> References: <1519301715-31798-1-git-send-email-yamada.masahiro@socionext.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180222_041626_844479_9477C123 X-CRM114-Status: GOOD ( 10.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Howells , Masahiro Yamada , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP I am going to add include/linux/const.h for the kernel space. Add _UAPI to the include guard of include/uapi/linux/const.h to prepare for that. Please notice the guard name of the exported one will be kept as-is. So, this commit has no impact to the userspace even if some userspace stuff depends on the guard macro names. scripts/headers_install.sh processes exported headers by SED, and rips off "_UAPI" from guard macro names. #ifndef _UAPI_LINUX_CONST_H #define _UAPI_LINUX_CONST_H will be turned into #ifndef _LINUX_CONST_H #define _LINUX_CONST_H Signed-off-by: Masahiro Yamada --- Changes in v3: - Split out as a prerequisite patch and describe detailed information Changes in v2: None include/uapi/linux/const.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h index 9253775..c5a60eb 100644 --- a/include/uapi/linux/const.h +++ b/include/uapi/linux/const.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* const.h: Macros for dealing with constants. */ -#ifndef _LINUX_CONST_H -#define _LINUX_CONST_H +#ifndef _UAPI_LINUX_CONST_H +#define _UAPI_LINUX_CONST_H /* Some constant macros are used in both assembler and * C code. Therefore we cannot annotate them always with @@ -25,4 +25,4 @@ #define _BITUL(x) (_AC(1,UL) << (x)) #define _BITULL(x) (_AC(1,ULL) << (x)) -#endif /* !(_LINUX_CONST_H) */ +#endif /* _UAPI_LINUX_CONST_H */