alpha: uapi: Add support for __SANE_USERSPACE_TYPES__
Subsystems (2)
PATCH 1/1 alpha: uapi: Add support for __SANE_USERSPACE_TYPES__
This fixes compiler errors in perf such as:
tests/attr.c: In function 'store_event':tests/attr.c:66:27: error: format '%llu' expects argument of type 'long long unsigned int', but argument 6 has type '__u64 {aka long unsigned int}' [-Werror=format=]
snprintf(path, PATH_MAX, "%s/event-%d-%llu-%d", dir,
^
Signed-off-by Ben Hutchings <[email protected]>
Tested-by Michael Cree <[email protected]>
--- arch/alpha/include/asm/types.h | 2 +- arch/alpha/include/uapi/asm/types.h | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-)
arch/alpha/include/asm/types.h +1 -1
@@ -1,6 +1,6 @@#ifndef _ALPHA_TYPES_H#define _ALPHA_TYPES_H -#include <asm-generic/int-ll64.h> +#include <uapi/asm/types.h> #endif /* _ALPHA_TYPES_H */
arch/alpha/include/uapi/asm/types.h +11 -1
@@ -9,8 +9,18 @@* need to be careful to avoid a name clashes. */ -#ifndef __KERNEL__ +/* +* This is here because we used to use l64 for alpha +* and we don't want to impact user mode with our change to ll64 +* in the kernel. +* +* However, some user programs are fine with this. They can +* flag __SANE_USERSPACE_TYPES__ to get int-ll64.h here. +*/ +#if !defined(__SANE_USERSPACE_TYPES__) && !defined(__KERNEL__)#include <asm-generic/int-l64.h> +#else +#include <asm-generic/int-ll64.h> #endif #endif /* _UAPI_ALPHA_TYPES_H */
Signature · 2 lines
Ben Hutchings Knowledge is power. France is bacon.