From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752066AbdBFSZb (ORCPT ); Mon, 6 Feb 2017 13:25:31 -0500 Received: from mail.kernel.org ([198.145.29.136]:45676 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751963AbdBFSZa (ORCPT ); Mon, 6 Feb 2017 13:25:30 -0500 Date: Mon, 6 Feb 2017 15:25:23 -0300 From: Arnaldo Carvalho de Melo To: David Carrillo-Cisneros Cc: linux-kernel@vger.kernel.org, Ingo Molnar , Peter Zijlstra , Jiri Olsa , Alexander Shishkin , Wang Nan , He Kuang , Michal Marek , Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= , Stephane Eranian , Paul Turner Subject: Re: [PATCH 4/4] tools include: Fix include path for uapi/asm-generic/mman.h Message-ID: <20170206182523.GB24988@kernel.org> References: <20170202063804.94027-1-davidcc@google.com> <20170202063804.94027-5-davidcc@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170202063804.94027-5-davidcc@google.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Wed, Feb 01, 2017 at 10:38:04PM -0800, David Carrillo-Cisneros escreveu: > commit f3539c12d819 ("tools include: Add uapi mman.h for each architecture") > > copied include/uapi/linux/mman.h into tools/include/uapi/linux/mman.h > but did not update the include path for uapi/asm-generic/mman.h. Fix it. What problem is this fixing? I.e. one is supposed to include , get the tools/include/uapi/linux/mman.h and it in turn will include the per-arch mman.h, say tools/arch/sparc/include/uapi/asm/mman.h, that in turn will include uapi/asm-generic/mman-common.h after defining its diverging bits. Some, like the ones for the Alpha and MIPS architectures, will not even include mman-common.h, so diverging they are. Lots of arches, like s390, will just include uapi/asm-generic/mman.h from its mman.h file (tools/arch/s390/include/uapi/asm/mman.h), just like you'd do for _all_ arches in your patch below. tools/perf/Makefile.config is the one doing: INC_FLAGS += -I$(srctree)/tools/arch/$(ARCH)/include/ and: [acme@jouet linux]$ ls tools/arch/*/include/uapi/asm/mman.h tools/arch/alpha/include/uapi/asm/mman.h tools/arch/ia64/include/uapi/asm/mman.h tools/arch/s390/include/uapi/asm/mman.h tools/arch/arc/include/uapi/asm/mman.h tools/arch/m32r/include/uapi/asm/mman.h tools/arch/score/include/uapi/asm/mman.h tools/arch/arm64/include/uapi/asm/mman.h tools/arch/microblaze/include/uapi/asm/mman.h tools/arch/sh/include/uapi/asm/mman.h tools/arch/arm/include/uapi/asm/mman.h tools/arch/mips/include/uapi/asm/mman.h tools/arch/sparc/include/uapi/asm/mman.h tools/arch/frv/include/uapi/asm/mman.h tools/arch/mn10300/include/uapi/asm/mman.h tools/arch/tile/include/uapi/asm/mman.h tools/arch/h8300/include/uapi/asm/mman.h tools/arch/parisc/include/uapi/asm/mman.h tools/arch/x86/include/uapi/asm/mman.h tools/arch/hexagon/include/uapi/asm/mman.h tools/arch/powerpc/include/uapi/asm/mman.h tools/arch/xtensa/include/uapi/asm/mman.h [acme@jouet linux]$ Am I missing something? - Arnaldo > Signed-off-by: David Carrillo-Cisneros > --- > tools/include/uapi/linux/mman.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/include/uapi/linux/mman.h b/tools/include/uapi/linux/mman.h > index 81d8edf11789..74a19ae15cd1 100644 > --- a/tools/include/uapi/linux/mman.h > +++ b/tools/include/uapi/linux/mman.h > @@ -1,7 +1,7 @@ > #ifndef _UAPI_LINUX_MMAN_H > #define _UAPI_LINUX_MMAN_H > > -#include > +#include > > #define MREMAP_MAYMOVE 1 > #define MREMAP_FIXED 2 > -- > 2.11.0.483.g087da7b7c-goog