Messages in this thread Patch in this message | | | Date | Mon, 6 Feb 2017 15:25:23 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH 4/4] tools include: Fix include path for uapi/asm-generic/mman.h |
| |
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 <linux/mman.h>, 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 <davidcc@google.com> > --- > 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 <uapi/asm/mman.h> > +#include <uapi/asm-generic/mman.h> > > #define MREMAP_MAYMOVE 1 > #define MREMAP_FIXED 2 > -- > 2.11.0.483.g087da7b7c-goog
| |