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: 129222 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp1935689edc; Thu, 22 Feb 2018 04:16:45 -0800 (PST) X-Google-Smtp-Source: AH8x226b+k2o+WAndT4YDDRODhJ2FrQVT1Fwlq20+QUE/TBvIvkZZX9gonDwYOYIZHfJDG92BGrQ X-Received: by 10.98.220.207 with SMTP id c76mr6667473pfl.159.1519301805372; Thu, 22 Feb 2018 04:16:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519301805; cv=none; d=google.com; s=arc-20160816; b=nvFdvlBKdIXa7FEVZkLXY7t4692wbKzfYLbE0/rvYJ2D2CiiF4ufWsd7JUCUsHxQdk W+0EW52dhzx5rTCRyHmpSxLGZRUvs1H9cnAlPlOHOtBxO3S6+3Qp4x9oCPw9tL3rSIqk qLkOg8yNYz6ZU5eTvesrTXQhvSQjuoKx038wYRWhvG56WTzILjAOBeX3u3XjFTK07NVw iKZ97yrGN2xEIMRIUOqZbrIt+hzMtRvVoFDV1ku/0OQg0tYVUpawD+MWuIv5OKXtGl4J mDP/2b9BDcojyzMYtcivD2aCz3DIulpynaOzKZlt2NqcQvPxoEkiGdAen/mUGgZYhjNY 45Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=45+u74fNHpnaXHWviwnehs+VE9r2iGHGrrC9K1HchMo=; b=xB0fEDKN6B2s16ZN5S/uqTDD6qVRYg5ESmkaOeK0tdpJIUCm1SaJ8N9HMN9jyJyk15 xJDHZ0RdcwzAGevYQ8NY7LMP/yh5ix7IndrOYk3yOEQAyIB8ZLi7e7E0CD9NzlyrwGgw ekCXtCCb24SzRRJoQt62PbuBTiP6LjpARYW0ejf/6FfJNG7n9iV1NJ2ae3DnHI/0ILi4 diK6wNeFH5AiRql/WJlZ7B1fUu/s0BP2tyJnDN8fZiCo0If2MTov82JF7EfUIO7uD4Ez XD9smnVLQiMsLH88ftDQRTHfjy+GnlGjT4PZ+QVcMK7DBxZNVRRj94EOGG+6M/gk5odu aZSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=tYBBiVCU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9-v6si1230589pls.560.2018.02.22.04.16.45; Thu, 22 Feb 2018 04:16:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=tYBBiVCU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932421AbeBVMQm (ORCPT + 28 others); Thu, 22 Feb 2018 07:16:42 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:61671 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932077AbeBVMQe (ORCPT ); Thu, 22 Feb 2018 07:16:34 -0500 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 Cc: David Howells , linux-arm-kernel@lists.infradead.org, Masahiro Yamada , linux-kernel@vger.kernel.org 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.7.4 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 */