On Wed, Feb 01, 2017 at 10:38:04PM -0800, David Carrillo-Cisneros wrote:
> 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.
>
> Signed-off-by: David Carrillo-Cisneros <davi...@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
>
Arnaldo,
could you please squash in the check-headers.sh update
as well..
thanks,
jirka
---
diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh
index c747bfd7f14d..87187b0b3bc0 100755
--- a/tools/perf/check-headers.sh
+++ b/tools/perf/check-headers.sh
@@ -56,4 +56,4 @@ done
check arch/x86/lib/memcpy_64.S -B -I "^EXPORT_SYMBOL" -I "^#include
<asm/export.h>"
check arch/x86/lib/memset_64.S -B -I "^EXPORT_SYMBOL" -I "^#include
<asm/export.h>"
check include/uapi/asm-generic/mman.h -B -I "^#include
<\(uapi/\)*asm-generic/mman-common.h>"
-check include/uapi/linux/mman.h -B -I "^#include <\(uapi/\)*asm/mman.h>"
+check include/uapi/linux/mman.h -B -I "^#include
<\(uapi/\)*asm\(-generic\)*/mman.h>"
